jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/447040 )
Change subject: Require cryptography<2.3 for Python 2.7.6 or older ......................................................................
Require cryptography<2.3 for Python 2.7.6 or older
We could also use cryptography<=2.3, but then we would have to silence the deprecation warning in our code which needs extra work. I believe this is enough for most pywikibot users, others should simply override the requirement or upgrade their python version.
No need to install cryptography or idna for python 3. Fix the requirement discrepancy between requests-requirements.txt and requirements.txt
Bug: T199959 Change-Id: I1632be7078bb0820d3d3feaaa3a0ddf0eff87503 --- M requests-requirements.txt M requirements.txt 2 files changed, 5 insertions(+), 3 deletions(-)
Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified
diff --git a/requests-requirements.txt b/requests-requirements.txt index a1e6994..98c4f2c 100644 --- a/requests-requirements.txt +++ b/requests-requirements.txt @@ -4,8 +4,9 @@
# requests security extra # Bug T105767 on Python 2.7 release 9+ -cryptography>=1.3.4 ; python_full_version < '2.7.9' or python_version > '3.3' +cryptography>=1.3.4 ; python_full_version == '2.7.7' or python_full_version == '2.7.8' +cryptography>=1.3.4,<2.3 ; python_full_version <= '2.7.6' pyOpenSSL>=0.14,!=17.2.0 ; python_full_version < '2.7.9' -idna>=2.0.0 ; python_full_version < '2.7.9' or python_version >= '3' +idna>=2.0.0 ; python_full_version < '2.7.9' # https://github.com/eliben/pycparser/issues/147 pycparser != 2.14 diff --git a/requirements.txt b/requirements.txt index 75c17c1..18c5c52 100644 --- a/requirements.txt +++ b/requirements.txt @@ -22,7 +22,8 @@ requests>=2.9,!=2.18.2
# requests security extra -cryptography>=1.3.4 ; python_full_version < '2.7.9' +cryptography>=1.3.4 ; python_full_version == '2.7.7' or python_full_version == '2.7.8' +cryptography>=1.3.4,<2.3 ; python_full_version <= '2.7.6' pyOpenSSL>=0.14,!=17.2.0 ; python_full_version < '2.7.9'
idna>=2.0.0 ; python_full_version < '2.7.9'