jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/562047 )

Change subject: [dependency] Update requests requirements ......................................................................

[dependency] Update requests requirements

- Requests has officially stopped support for Python 3.4. - require 2.20.1 bugfix (fixed bug with unintended Authorization header stripping for redirects using default ports) - update enum dependency - update doc in eventstreams.py

Bug: T241934 Change-Id: I5c49aaab01bbc9ad7e4d31ec8e44adda30c8223d --- M pywikibot/comms/eventstreams.py M requirements.txt M setup.py 3 files changed, 7 insertions(+), 4 deletions(-)

Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified

diff --git a/pywikibot/comms/eventstreams.py b/pywikibot/comms/eventstreams.py index 63f5a5b..9c6429e 100644 --- a/pywikibot/comms/eventstreams.py +++ b/pywikibot/comms/eventstreams.py @@ -37,7 +37,7 @@ if LooseVersion(requests.__version__) < LooseVersion('2.9'): raise ImportError( 'requests >= 2.9 is required for EventStreams;\n' - "install it with 'pip install "requests>=2.20.0"'\n") + "install it with 'pip install "requests>=2.20.1"'\n")

_logger = 'pywikibot.eventstreams' diff --git a/requirements.txt b/requirements.txt index c51590b..f8d1aa5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -19,8 +19,9 @@ # $ awk -F '[#>=]' '{print $1}' requirements.txt | xargs apt-cache search

# mandatory; see README.conversion.txt -requests>=2.20.0 -enum34 ; 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' # requests security extra requests[security] ; python_full_version > '2.7.6' and python_full_version < '2.7.9'

diff --git a/setup.py b/setup.py index 066bb9c..56bf1c2 100644 --- a/setup.py +++ b/setup.py @@ -94,7 +94,9 @@ extra_deps.update(script_deps)

# ------- setup install_requires ------- # -dependencies = ['requests>=2.20.0', 'enum34>=1.1.6; python_version < "3"'] +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, # as it falls back to using regexes if one is not available. # The functional backport of py3 ipaddress is acceptable: