From 51ce73e20bb2908105adb5b53d8a7b74c3c4937e Mon Sep 17 00:00:00 2001 From: 18302918689 <1360148247@qq.com> Date: Tue, 2 Feb 2021 17:32:26 +0800 Subject: [PATCH] slove setuptools_scm upgrade lead to tox complication failures --- backport-fix-build-failed-err.patch | 24 ++++++++++++++++++++++++ python-tox.spec | 10 ++++++++-- 2 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 backport-fix-build-failed-err.patch diff --git a/backport-fix-build-failed-err.patch b/backport-fix-build-failed-err.patch new file mode 100644 index 0000000..cf89a1f --- /dev/null +++ b/backport-fix-build-failed-err.patch @@ -0,0 +1,24 @@ +diff -Naur a/pyproject.toml b/pyproject.toml +--- a/pyproject.toml 2021-02-02 17:11:47.542490469 +0800 ++++ b/pyproject.toml 2021-02-02 17:13:04.363419475 +0800 +@@ -1,7 +1,7 @@ + [build-system] + requires = [ + "setuptools >= 40.0.4", +- "setuptools_scm >= 2.0.0, <4", ++ "setuptools_scm >= 2.0.0, <6", + "wheel >= 0.29.0", + ] + build-backend = 'setuptools.build_meta' +diff -Naur a/setup.py b/setup.py +--- a/setup.py 2021-02-02 17:11:47.542490469 +0800 ++++ b/setup.py 2021-02-02 17:13:46.093922146 +0800 +@@ -35,7 +35,7 @@ + "toml >=0.9.4", + "filelock >= 3.0.0, <4", + ], +- setup_requires=["setuptools-scm>2, <4"], # readthedocs needs it ++ setup_requires=["setuptools-scm>2, <6"], # readthedocs needs it + extras_require={ + "testing": [ + "pytest >= 3.0.0, <4", diff --git a/python-tox.spec b/python-tox.spec index 119dad3..a614734 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -1,11 +1,13 @@ Name: python-tox Version: 3.5.3 -Release: 3 +Release: 4 Summary: Virtualenv-based automation of test activities License: MIT URL: https://tox.readthedocs.io/ Source0: https://files.pythonhosted.org/packages/source/t/tox/tox-%{version}.tar.gz +Patch9000: backport-fix-build-failed-err.patch + BuildArch: noarch %description @@ -45,7 +47,11 @@ rm -rf tox.egg-info %doc README.rst %changelog -* Sat Jun 21 2020 hanhui - 3.5.3-2 +* Tue Feb 2 2021 hanhui - 3.5.3-4 +- bugfix +- DESC:slove setuptools_scm upgrade lead to tox complication failures + +* Sat Jun 21 2020 hanhui - 3.5.3-3 - bugfix - DESC:fix python-ldap requires