Merge pull request #1494 from ucb-bar/fix-reqs

Downgrade cryptography | Pin linux sysroot
ucb-bar · Jun 1, 2023 · 16c1c07 · 16c1c07
2 parents 2aca0e2 + b2d7e4b
commit 16c1c07
Show file tree

Hide file tree

Showing 3 changed files with 118 additions and 117 deletions.
diff --git a/conda-reqs/chipyard.yaml b/conda-reqs/chipyard.yaml
@@ -25,7 +25,7 @@ dependencies:
 
     - gcc
     - gxx
-    - sysroot_linux-64>=2.17 # needed to match pre-built CI XRT glibc version
+    - sysroot_linux-64=2.17 # needed to match pre-built CI XRT glibc version
     - conda-gcc-specs
     - binutils
 
@@ -143,6 +143,7 @@ dependencies:
     - mypy-boto3-s3
     - mypy_boto3_ec2
     - botocore-stubs
+    - cryptography<41
     - pytz
     - types-pytz
     - pyyaml

diff --git a/conda-reqs/conda-lock-reqs/conda-requirements-esp-tools-linux-64.conda-lock.yml b/conda-reqs/conda-lock-reqs/conda-requirements-esp-tools-linux-64.conda-lock.yml