!5 slove setuptools upgrade lead to tox complication failures

From: @shirely16
Reviewed-by: @hanxinke
Signed-off-by: @hanxinke
This commit is contained in:
openeuler-ci-bot 2021-02-02 19:19:27 +08:00 committed by Gitee
commit 4692746490
2 changed files with 32 additions and 2 deletions

View File

@ -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",

View File

@ -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<hanhui15@huawei.com> - 3.5.3-2
* Tue Feb 2 2021 hanhui<hanhui15@huawei.com> - 3.5.3-4
- bugfix
- DESC:slove setuptools_scm upgrade lead to tox complication failures
* Sat Jun 21 2020 hanhui<hanhui15@huawei.com> - 3.5.3-3
- bugfix
- DESC:fix python-ldap requires