From 55344cabf8725d45e207e3f1134a4c8027e66dac Mon Sep 17 00:00:00 2001 From: Ken Odegard Date: Wed, 31 May 2023 22:35:24 -0500 Subject: [PATCH 1/2] conda-content-trust doesn't work with cryptography 41.0.0 --- main.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/main.py b/main.py index 4515cd9..ffd6527 100644 --- a/main.py +++ b/main.py @@ -918,6 +918,9 @@ def patch_record_in_place(fn, record, subdir): if version.startswith('2.4.0'): # = 2.4.0* replace_dep(depends, ['conda', 'conda !=22.11.*'], 'conda <23.5.0,!=22.11.*') + if name == "conda-content-trust" and version == "0.1.3": + replace_dep(depends, "cryptography", "cryptography <41.0.0") + ######################## # run_exports mis-pins # ######################## From 859e53489e87dd76867d30f2e1ff603497eb6c54 Mon Sep 17 00:00:00 2001 From: Ken Odegard Date: Tue, 6 Jun 2023 08:38:03 -0500 Subject: [PATCH 2/2] Apply suggestions from code review Co-authored-by: Jannis Leidel --- main.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/main.py b/main.py index ffd6527..4be8b08 100644 --- a/main.py +++ b/main.py @@ -919,8 +919,7 @@ def patch_record_in_place(fn, record, subdir): replace_dep(depends, ['conda', 'conda !=22.11.*'], 'conda <23.5.0,!=22.11.*') if name == "conda-content-trust" and version == "0.1.3": - replace_dep(depends, "cryptography", "cryptography <41.0.0") - + replace_dep(depends, "cryptography", "cryptography <41.0.0a0") ######################## # run_exports mis-pins # ########################