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

Change subject: Require PyOpenSSL<17.5.0 for Python 3.3 ......................................................................

Require PyOpenSSL<17.5.0 for Python 3.3

Bug: T181912 Change-Id: Id37b8dd8dd4329ad39f386a811af2180821f450e --- M requests-requirements.txt M requirements.txt M setup.py 3 files changed, 8 insertions(+), 2 deletions(-)

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

diff --git a/requests-requirements.txt b/requests-requirements.txt index 57ad0bc..94cf204 100644 --- a/requests-requirements.txt +++ b/requests-requirements.txt @@ -2,7 +2,8 @@

# requests security extra # Bug T105767 on Python 2.7 release 9+ -pyOpenSSL>=0.14,!=17.2.0 ; python_full_version < '2.7.9' or python_version >= '3' +pyOpenSSL>=0.14,!=17.2.0 ; python_full_version < '2.7.9' or python_version > '3.3' +pyOpenSSL<17.5.0 ; python_version == '3.3' cryptography>=1.3.4 ; python_full_version < '2.7.9' or python_version > '3.3' cryptography>=1.3.4,<2.0 ; python_version == '3.3' idna>=2.0.0 ; python_full_version < '2.7.9' or python_version >= '3' diff --git a/requirements.txt b/requirements.txt index 13598af..f0a96f4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -23,7 +23,9 @@

# requests security extra pyOpenSSL>=0.14,!=17.2.0 ; python_full_version < '2.7.9' +PyOpenSSL<17.5.0 ; python_version == '3.3' cryptography>=1.3.4 ; python_full_version < '2.7.9' +cryptography>=1.3.4,<2.0 ; python_version == '3.3' idna>=2.0.0 ; python_full_version < '2.7.9' # https://github.com/eliben/pycparser/issues/147 pycparser != 2.14 diff --git a/setup.py b/setup.py index aa28872..6e895d5 100644 --- a/setup.py +++ b/setup.py @@ -74,9 +74,12 @@ 'unicode7': ['unicodedata2>=7.0.0-2'], }) elif PYTHON_VERSION[:2] == (3, 3): - # requests[security] requires cryptography, but cryptography does not + # requests[security] requires cryptography, but cryptography 2.0+ does not # support Python 3.3; T178241 extra_deps['security'].append('cryptography<2.0') + # PyOpenSSL is required by requests[security] but has dropped support for + # Python 3.3 since version 17.5.0 (2017-11-30); T181912 + extra_deps['security'].append('PyOpenSSL<17.5.0')

script_deps = { 'flickrripper.py': ['Pillow<3.5.0' if PY26 else 'Pillow'],