jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/567427 )
Change subject: Revert "[bugfix] prevent installing urllib3 == 1.25.8 with Python 2" ......................................................................
Revert "[bugfix] prevent installing urllib3 == 1.25.8 with Python 2"
This reverts commit 549c1bc955fd497d89856dd92beeb2a0b9e9c7e3.
Change-Id: I11f854ddbb553030dd45252f31ee248ded1e87de --- M requirements.txt M setup.py 2 files changed, 1 insertion(+), 3 deletions(-)
Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified
diff --git a/requirements.txt b/requirements.txt index ca5704c..9464a2e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -19,7 +19,6 @@ # $ 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 449b2c7..f51970e 100644 --- a/setup.py +++ b/setup.py @@ -97,8 +97,7 @@ extra_deps.update(script_deps)
# ------- setup install_requires ------- # -dependencies = ['urllib3!=1.25.8; python_version < "3"', - 'requests>=2.20.1,<2.22.0; python_version == "3.4"', +dependencies = ['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,