jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/567326 )
Change subject: [bugfix] prevent installing urllib3 == 1.25.8 with Python 2
......................................................................
[bugfix] prevent installing urllib3 == 1.25.8 with Python 2
Bug: T243710
Change-Id: Idd3083f9c5de049fdf9632cedabc5fceb424cb35
---
M requirements.txt
M setup.py
2 files changed, 3 insertions(+), 1 deletion(-)
Approvals:
Dvorapa: Looks good to me, approved
jenkins-bot: Verified
diff --git a/requirements.txt b/requirements.txt
index 9464a2e..ca5704c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -19,6 +19,7 @@
# $ awk -F '[#>=]' '{print $1}' requirements.txt | xargs apt-cache
search
# mandatory; see README.conversion.txt
+urllib3!=1.25.8; python_version < '3'
requests>=2.20.1,<2.22.0; python_version == '3.4'
requests>=2.20.1; python_version != '3.4'
enum34>=1.1.6; python_version < '3'
diff --git a/setup.py b/setup.py
index f51970e..449b2c7 100644
--- a/setup.py
+++ b/setup.py
@@ -97,7 +97,8 @@
extra_deps.update(script_deps)
# ------- setup install_requires ------- #
-dependencies = ['requests>=2.20.1,<2.22.0; python_version ==
"3.4"',
+dependencies = ['urllib3!=1.25.8; python_version < "3"',
+ 'requests>=2.20.1,<2.22.0; python_version ==
"3.4"',
'requests>=2.20.1; python_version != "3.4"',
'enum34>=1.1.6; python_version < "3"']
# tools.ip does not have a hard dependency on an IP address module,
--
To view, visit
https://gerrit.wikimedia.org/r/567326
To unsubscribe, or for help writing mail filters, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Idd3083f9c5de049fdf9632cedabc5fceb424cb35
Gerrit-Change-Number: 567326
Gerrit-PatchSet: 3
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot (75)