From 3ad38665a923572550d48ed9fd9b881627dfb018 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 17 Feb 2021 10:36:42 +0000 Subject: [PATCH 1/2] build(deps): bump cryptography from 3.4.5 to 3.4.6 Bumps [cryptography](https://github.com/pyca/cryptography) from 3.4.5 to 3.4.6. - [Release notes](https://github.com/pyca/cryptography/releases) - [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pyca/cryptography/compare/3.4.5...3.4.6) Signed-off-by: dependabot-preview[bot] --- requirements-pinned.txt | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) mode change 100755 => 100644 setup.py diff --git a/requirements-pinned.txt b/requirements-pinned.txt index 2399e781..9121cb2a 100644 --- a/requirements-pinned.txt +++ b/requirements-pinned.txt @@ -1,7 +1,7 @@ cffi==1.14.5 # via cryptography, pynacl colorama==0.4.4 cryptography==3.3.2 ; python_version < "3" # cryptography < 3.4 for python2 compat -cryptography==3.4.5 ; python_version >= "3" +cryptography==3.4.6 ; python_version >= "3" enum34==1.1.10 ; python_version < "3" # via cryptography ipaddress==1.0.23 ; python_version < "3" # via cryptography pycparser==2.20 # via cffi diff --git a/setup.py b/setup.py old mode 100755 new mode 100644 index 7f22a502..27122725 --- a/setup.py +++ b/setup.py @@ -107,7 +107,7 @@ install_requires = ['six>=1.11.0', 'subprocess32; python_version < "3"'], extras_require = { 'colors': ['colorama>=0.3.9'], - 'crypto:python_version < "3"': ['cryptography>=3.3.2,<3.4'], + 'crypto:python_version < "3"': ['cryptography>=3.3.2,<3.5'], 'crypto:python_version >= "3"': ['cryptography>=3.3.2'], 'pynacl': ['pynacl>1.2.0']}, tests_require = 'mock; python_version < "3.3"', From 428d13094e386031ccf602bcc1e07f1c6f11055c Mon Sep 17 00:00:00 2001 From: Lukas Puehringer Date: Fri, 26 Feb 2021 09:15:23 +0100 Subject: [PATCH 2/2] Partially revert cryptography auto-bump for py2 cryptography >= 3.4 doesn't support Py2 anymore, so we have to constrain it in requirements-pinned.txt and setup.py. Dependabot keeps bumping the latter regardless, thus the revert. Signed-off-by: Lukas Puehringer --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 27122725..7f22a502 100644 --- a/setup.py +++ b/setup.py @@ -107,7 +107,7 @@ install_requires = ['six>=1.11.0', 'subprocess32; python_version < "3"'], extras_require = { 'colors': ['colorama>=0.3.9'], - 'crypto:python_version < "3"': ['cryptography>=3.3.2,<3.5'], + 'crypto:python_version < "3"': ['cryptography>=3.3.2,<3.4'], 'crypto:python_version >= "3"': ['cryptography>=3.3.2'], 'pynacl': ['pynacl>1.2.0']}, tests_require = 'mock; python_version < "3.3"',