Merge branch '2.8' into 2.9

2 files changed, 13 insertions, 1 deletions

diff --git a/setup.py b/setup.py
index 56997532..c9de0154 100644
--- a/setup.py
+++ b/setup.py
@@ -90,6 +90,12 @@ 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"],
+    # 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 0b1bd9fe..48119f00 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 <https://bitprophet.org/projects/#roadmap>`_. Thanks to Sondre
+  Lillebø Gundersen for catch & patch.
 - :release:`2.9.2 <2022-01-08>`
 - :bug:`-` Connecting to servers which support ``server-sig-algs`` but which
   have no overlap between that list and what a Paramiko client supports, now