jenkins-bot has submitted this change. (
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/700475 )
Change subject: [deps] Fix "Double requirement given" error
......................................................................
[deps] Fix "Double requirement given" error
https://ci.appveyor.com/project/Ladsgroup/pywikibot-g4xqx/builds/39674793/j…
Change-Id: I9c12b8d324dae168b391026d31a25e49b0400425
---
M requirements.txt
M setup.py
2 files changed, 8 insertions(+), 8 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/requirements.txt b/requirements.txt
index 60156bd..fadaf2e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -21,8 +21,8 @@
requests>=2.20.1, < 2.26.0; python_version < '3.6'
requests>=2.20.1 ; 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>=38.5.2 ; python_version >= '3.7' and python_version <
'3.10'
+setuptools>=20.8.1 ; python_version >= '3.6' and python_version <
'3.7'
setuptools>=20.8.1, !=50.0.0, <50.2.0 ; python_version < '3.6'
# MediaWiki markup parser
diff --git a/setup.py b/setup.py
index 17e3310..cd0bfa4 100644
--- a/setup.py
+++ b/setup.py
@@ -63,8 +63,8 @@
'Graphviz': ['pydot>=1.2'],
'Google': ['google>=1.7'],
'mwparserfromhell': ['mwparserfromhell>=0.5.0'],
- 'wikitextparser':
['wikitextparser>=0.47.5;python_version<"3.6"',
- 'wikitextparser>=0.47.0'],
+ 'wikitextparser': ['wikitextparser>=0.47.5; python_version <
"3.6"',
+ 'wikitextparser>=0.47.0; python_version >=
"3.6"'],
'Tkinter': [ # vulnerability found in Pillow<8.1.1
'Pillow>=8.1.1;python_version>="3.6"',
],
@@ -78,8 +78,8 @@
'flake8-bugbear!=21.4.1',
'flake8-coding',
'flake8-colors>=0.1.9',
- 'flake8-comprehensions>=3.1.4;python_version>="3.8"',
- 'flake8-comprehensions>=2.2.0',
+ 'flake8-comprehensions>=3.1.4; python_version >= "3.8"',
+ 'flake8-comprehensions>=2.2.0; python_version < "3.8"',
'flake8-docstrings>=1.3.1',
'flake8-future-import',
'flake8-mock>=0.3',
@@ -111,8 +111,8 @@
'requests>=2.20.1;python_version>="3.6"',
# PEP 440
'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>=38.5.2 ; python_version >= "3.7" and python_version
< "3.10"',
+ 'setuptools>=20.8.1 ; python_version >= "3.6" and python_version
< "3.7"',
'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/+/700475
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: I9c12b8d324dae168b391026d31a25e49b0400425
Gerrit-Change-Number: 700475
Gerrit-PatchSet: 1
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot
Gerrit-MessageType: merged