jenkins-bot has submitted this change. (
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/700163 )
Change subject: [deps] update setuptools requirements
......................................................................
[deps] update setuptools requirements
After backport of vendor package version.Version due to T284299
setuptools 49.4.0 is no longer necessary. Fall back to the very
minimal version which 20.8.1 due to requirement.marker.
Newer version of setuptools is recommended.
- use 48.0.0 with python_version >= 3.10 because setuptools adopts
distutils from the Python 3.9 standard library which is deprecated
since Python 3.10 and will be dropped with Python 3.12
- use 38.5.2 with python_version >= 3.7 due to the fix of RuntimeError
in pkg_resources.parse_requirements on Python 3.7
See also:
https://setuptools.readthedocs.io/en/latest/history.html
Bug: T284297
Change-Id: I35008f29735037dfe70392803e94551738572d66
---
M requirements.txt
M setup.py
2 files changed, 8 insertions(+), 4 deletions(-)
Approvals:
JJMC89: Looks good to me, approved
jenkins-bot: Verified
diff --git a/requirements.txt b/requirements.txt
index d45bdae..60156bd 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -20,8 +20,10 @@
# mandatory dependencies, others are optional
requests>=2.20.1, < 2.26.0; python_version < '3.6'
requests>=2.20.1 ; python_version >= '3.6'
-setuptools>=49.4.0, !=50.0.0, <50.2.0 ; python_version < '3.6'
-setuptools>=49.4.0 ; python_version >= '3.6'
+setuptools>=48.0.0 ; python_version >= '3.10'
+setuptools>=38.5.2 ; python_version >= '3.7'
+setuptools>=20.8.1 ; python_version >= '3.6'
+setuptools>=20.8.1, !=50.0.0, <50.2.0 ; python_version < '3.6'
# MediaWiki markup parser
# mwparserfromhell is default, wikitextparser can be used instead
diff --git a/setup.py b/setup.py
index 2d5438f..17e3310 100644
--- a/setup.py
+++ b/setup.py
@@ -110,8 +110,10 @@
'requests>=2.20.1,<2.26.0;python_version<"3.6"',
'requests>=2.20.1;python_version>="3.6"',
# PEP 440
- 'setuptools>=49.4.0, !=50.0.0, <50.2.0 ; python_version <
"3.6"',
- 'setuptools>=49.4.0 ; python_version >= "3.6"',
+ 'setuptools>=48.0.0 ; python_version >= "3.10"',
+ 'setuptools>=38.5.2 ; python_version >= "3.7"',
+ 'setuptools>=20.8.1 ; python_version >= "3.6"',
+ 'setuptools>=20.8.1, !=50.0.0, <50.2.0 ; python_version <
"3.6"',
]
# in addition either mwparserfromhell or wikitextparser is required
--
To view, visit
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/700163
To unsubscribe, or for help writing mail filters, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Change-Id: I35008f29735037dfe70392803e94551738572d66
Gerrit-Change-Number: 700163
Gerrit-PatchSet: 2
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz>
Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com>
Gerrit-Reviewer: jenkins-bot
Gerrit-MessageType: merged