From 11232cca7be7bc5fc51eef1e8869db4450bc79e3 Mon Sep 17 00:00:00 2001 From: Sondre Lillebø Gundersen Date: Thu, 10 Feb 2022 10:58:41 +0100 Subject: Add six to `install_requires` --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 56997532..c62a1bb4 100644 --- a/setup.py +++ b/setup.py @@ -90,6 +90,6 @@ setup( # TODO 3.0: alternately, given how prevalent ed25519 is now, and how we use # invoke for (increasing) subproc stuff, consider making the default flavor # "full" and adding a "minimal" or similar that is just-crypto? - install_requires=["bcrypt>=3.1.3", "cryptography>=2.5", "pynacl>=1.0.1"], + install_requires=["bcrypt>=3.1.3", "cryptography>=2.5", "pynacl>=1.0.1", "six"], extras_require=extras_require, ) -- cgit v1.2.3 From e0d5b1c63e25509d8014a5abfa7edcb83da696ec Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Fri, 25 Feb 2022 14:27:16 -0500 Subject: Comment and changelog re #1985 --- setup.py | 1 + sites/www/changelog.rst | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/setup.py b/setup.py index c62a1bb4..5a0acbac 100644 --- a/setup.py +++ b/setup.py @@ -90,6 +90,7 @@ setup( # TODO 3.0: alternately, given how prevalent ed25519 is now, and how we use # invoke for (increasing) subproc stuff, consider making the default flavor # "full" and adding a "minimal" or similar that is just-crypto? + # TODO 3.0: remove six, obviously install_requires=["bcrypt>=3.1.3", "cryptography>=2.5", "pynacl>=1.0.1", "six"], extras_require=extras_require, ) diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index c423f5a5..af1cef05 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -2,6 +2,12 @@ Changelog ========= +- :support:`1985` Add ``six`` explicitly to install-requires; it snuck into + active use at some point but has only been indicated by transitive dependency + on ``bcrypt`` until they somewhat-recently dropped it. This will be + short-lived until we `drop Python 2 + support `_. Thanks to Sondre + Lillebø Gundersen for catch & patch. - :release:`2.8.1 <2021-11-28>` - :bug:`985` (via :issue:`992`) Fix listdir failure when server uses a locale. Now on Python 2.7 `SFTPAttributes ` will -- cgit v1.2.3 From a318255e18accb7448ef76338b36483b06f40b4e Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Fri, 25 Feb 2022 14:28:31 -0500 Subject: blacken --- setup.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 5a0acbac..c9de0154 100644 --- a/setup.py +++ b/setup.py @@ -91,6 +91,11 @@ setup( # invoke for (increasing) subproc stuff, consider making the default flavor # "full" and adding a "minimal" or similar that is just-crypto? # TODO 3.0: remove six, obviously - install_requires=["bcrypt>=3.1.3", "cryptography>=2.5", "pynacl>=1.0.1", "six"], + install_requires=[ + "bcrypt>=3.1.3", + "cryptography>=2.5", + "pynacl>=1.0.1", + "six", + ], extras_require=extras_require, ) -- cgit v1.2.3