From 6facb5b94493d81fc5aa6c89e438ed489571998d Mon Sep 17 00:00:00 2001 From: Bart Oldeman Date: Thu, 23 Jul 2020 14:11:36 +0000 Subject: [PATCH 1/3] cryptography: require 2.9.2 for Python 2.7 The new 3.0 release deprecates support for Python 2.7 so is noisy, which breaks tests. --- requirements.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/requirements.txt b/requirements.txt index 0a8591c50f..0810f50cf2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -52,3 +52,7 @@ python-hglib requests archspec; python_version >= '2.7' + +# cryptography 3.0 deprecates Python 2.7 +cryptography==2.9.2; python_version < '3.5' +cryptography; python_version >= '3.5' From 3c7dc35cc626b055dee6ac2389481f4ed1124381 Mon Sep 17 00:00:00 2001 From: Bart Oldeman Date: Thu, 23 Jul 2020 14:42:17 +0000 Subject: [PATCH 2/3] Don't install cryptography at all for Python 2.6 As it's a dependency for another package that is not installed for Python 2.6. --- requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 0810f50cf2..965c6af517 100644 --- a/requirements.txt +++ b/requirements.txt @@ -54,5 +54,6 @@ requests archspec; python_version >= '2.7' # cryptography 3.0 deprecates Python 2.7 -cryptography==2.9.2; python_version < '3.5' +# and cryptography is not needed at all for Python 2.6 +cryptography==2.9.2; python_version >= 2.7, < '3.5' cryptography; python_version >= '3.5' From 66a795ff5224352ab09e6b708e489b17d76c1252 Mon Sep 17 00:00:00 2001 From: Bart Oldeman Date: Thu, 23 Jul 2020 14:58:56 +0000 Subject: [PATCH 3/3] Fix python 2.7 requirement for cryptography 2.9.2 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 965c6af517..ebbcbaaf29 100644 --- a/requirements.txt +++ b/requirements.txt @@ -55,5 +55,5 @@ archspec; python_version >= '2.7' # cryptography 3.0 deprecates Python 2.7 # and cryptography is not needed at all for Python 2.6 -cryptography==2.9.2; python_version >= 2.7, < '3.5' +cryptography==2.9.2; python_version == '2.7' cryptography; python_version >= '3.5'