summaryrefslogtreecommitdiff
path: root/sites
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2022-02-25 14:30:38 -0500
committerJeff Forcier <jeff@bitprophet.org>2022-02-25 14:30:38 -0500
commit60b4d1e025044090fea16de076dd0dbfb31e7f1d (patch)
tree2081664a9a79129075ec003b9061e4b3a6025bc4 /sites
parentc9a3409b6d4078b77167467feafe5f102ec53671 (diff)
parenta318255e18accb7448ef76338b36483b06f40b4e (diff)
downloadparamiko-60b4d1e025044090fea16de076dd0dbfb31e7f1d.tar.gz
Merge branch '2.8' into 2.9
Diffstat (limited to 'sites')
-rw-r--r--sites/www/changelog.rst6
1 files changed, 6 insertions, 0 deletions
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