Merge branch 'main' into chore/docs-account-migrate

canonical · Mar 1, 2024 · 4e22654 · 4e22654
2 parents dbbddac + 2b8061e
commit 4e22654
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/charmcraft.yaml b/charmcraft.yaml
@@ -11,6 +11,7 @@ parts:
       - libffi-dev  # for cffi
       - libssl-dev  # for cryptography
       - rust-all  # for cryptography
+      - pkg-config # for cryptography
     prime:
       - scripts/build-image.sh
       - scripts/repo_policy_compliance_service.py

diff --git a/requirements.txt b/requirements.txt
@@ -5,9 +5,9 @@ ops>=2.8
 pylxd @ git+https://github.com/canonical/pylxd
 requests
 typing-extensions
-# Newer version does not work with default OpenSSL version on jammy.
-cryptography <= 38.0.4
+cryptography <=42.0.0
 pydantic ==1.10.14
 cosl ==0.0.8
 # juju 3.1.2.0 depends on pyyaml<=6.0 and >=5.1.2
 PyYAML ==6.0.*
+pyOpenSSL==24.0.0