From e857d3b3acf6da0817d7e9b5f81c546ca3a2e522 Mon Sep 17 00:00:00 2001 From: noO0oOo0ob <38344038+noO0oOo0ob@users.noreply.github.com> Date: Wed, 22 Jan 2025 17:12:19 +0800 Subject: [PATCH] Bugfix/fix packaging error in pipline (#894) * remove third part package in setup * add comment --------- Co-authored-by: noO0ob --- lyrebird/version.py | 2 +- setup.py | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/lyrebird/version.py b/lyrebird/version.py index b75092e9..83c094dd 100644 --- a/lyrebird/version.py +++ b/lyrebird/version.py @@ -1,3 +1,3 @@ -IVERSION = (3, 2, 0) +IVERSION = (3, 2, 1) VERSION = ".".join(str(i) for i in IVERSION) LYREBIRD = "Lyrebird " + VERSION diff --git a/setup.py b/setup.py index a6764e45..4d3770f4 100644 --- a/setup.py +++ b/setup.py @@ -1,8 +1,7 @@ import runpy import os import sys -from packaging import version -from setuptools import setup, find_packages +from setuptools import setup here = os.path.abspath(os.path.dirname(__file__)) @@ -11,6 +10,7 @@ )["VERSION"] +# Formatting (Spaces, etc.) in requirement must be consistent based on string parsing def read_requirements(file_path): with open(file_path, encoding='utf-8') as f: return [ @@ -22,19 +22,20 @@ def read_requirements(file_path): ) ] + def check_version_condition(condition): if not condition.startswith('python_version'): return True op, ver = condition.split(' ', 1)[1].split(' ') - current_ver = version.parse('.'.join(map(str, sys.version_info[:2]))) - ver = version.parse(ver.strip('"')) + current_ver = sys.version_info[:2] + ver = tuple(map(int, ver.strip('"').split('.'))) return { '>': current_ver > ver, '>=': current_ver >= ver, '<': current_ver < ver, '<=': current_ver <= ver, '==': current_ver == ver - }.get(op, False) + }.get(op) with open(os.path.join(here, 'README.md'), encoding='utf-8') as f: @@ -68,6 +69,7 @@ def check_version_condition(condition): 'lyrebird = lyrebird.manager:main' ] }, + setup_requires=['packaging'], install_requires=read_requirements('requirements.txt.lock'), extras_require={ 'dev': read_requirements('requirements.dev.txt')