summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2023-01-09 17:36:08 -0500
committerJeff Forcier <jeff@bitprophet.org>2023-01-09 19:33:39 -0500
commit5983eb39f1bdda9721caa161901b06bc278b3eef (patch)
tree35bb93aabeb9b27053858e90b8ec5c4f555ddc61
parent39f458c834def3c217a3bd2eb62cc92032e20975 (diff)
downloadparamiko-5983eb39f1bdda9721caa161901b06bc278b3eef.tar.gz
Move to cryptography 3.3 as baseline dep
and bump top end test matrix cell to 40ish
-rw-r--r--.circleci/config.yml6
-rw-r--r--setup.py2
-rw-r--r--sites/www/changelog.rst4
3 files changed, 8 insertions, 4 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 91dbf9c8..96617237 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -63,9 +63,9 @@ workflows:
version: ["3.6"]
# TODO: I don't see a nicer way to do this that doesn't require
# making the orb know too much about its client code...
- # TODO: the upper end of this needs to move, or grow more cells,
- # periodically
- pip-overrides: ["cryptography==2.5", "cryptography==3.4"]
+ # TODO: the upper end of this needs to change and/or grow more
+ # cells, periodically
+ pip-overrides: ["cryptography>=3.3,<3.4", "cryptography>=40,<41"]
# Kerberos tests. Currently broken :(
#- kerberos:
# name: Test 3.6 w/ Kerberos support
diff --git a/setup.py b/setup.py
index fda27c61..11657a14 100644
--- a/setup.py
+++ b/setup.py
@@ -87,7 +87,7 @@ setup(
python_requires=">=3.6",
install_requires=[
"bcrypt>=3.1.3",
- "cryptography>=2.5",
+ "cryptography>=3.3",
"pynacl>=1.0.1",
],
extras_require=extras_require,
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 52b68056..774cde27 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -18,6 +18,10 @@ Changelog
``python_requires``, so this should not cause breakage unless you're on an
old installation method that can't read this metadata.
+ .. note::
+ As part of this change, our dependencies have been updated; eg we now
+ require Cryptography>=3.3, up from 2.5.
+
- :release:`2.12.0 <2022-11-04>`
- :feature:`2125` (also re: :issue:`2054`) Add a ``transport_factory`` kwarg to
`SSHClient.connect <paramiko.client.SSHClient.connect>` for advanced