Skip to content

Commit b785ed6

Browse files
[anaconda / miniconda] Temporary disable patch for cryptography due to issue with conda (devcontainers#715)
* [anaconda] Disable patch for `cryptography` * [miniconda] Disable patch for `cryptography` * Disable tests
1 parent 3944208 commit b785ed6

File tree

4 files changed

+6
-7
lines changed

4 files changed

+6
-7
lines changed

src/anaconda/.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ RUN . /etc/os-release && if [ "${VERSION_CODENAME}" != "bullseye" ]; then exit 1
88
RUN conda install \
99
# https://github.com/advisories/GHSA-5cpq-8wj7-hf2v
1010
pyopenssl=23.2.0 \
11-
cryptography=41.0.2 \
11+
# cryptography=41.0.2 # Disabled temporarily due to issue with conda \
1212
# https://github.com/advisories/GHSA-j8r2-6x86-q33q
1313
requests=2.31.0 \
1414
# https://github.com/advisories/GHSA-f865-m6cq-j9vx

src/anaconda/test-project/test.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ check "usr-local-etc-config-does-not-exist" test ! -f "/usr/local/etc/gitconfig"
3131

3232
checkPythonPackageVersion "joblib" "1.2.0"
3333
checkPythonPackageVersion "cookiecutter" "2.1.1"
34-
checkPythonPackageVersion "cryptography" "38.0.3"
3534
checkPythonPackageVersion "mistune" "2.0.3"
3635
checkPythonPackageVersion "numpy" "1.22"
3736
checkPythonPackageVersion "setuptools" "65.5.1"
@@ -41,7 +40,7 @@ checkPythonPackageVersion "nbconvert" "6.5.1"
4140
checkPythonPackageVersion "werkzeug" "2.2.3"
4241
checkPythonPackageVersion "certifi" "2022.12.07"
4342
checkPythonPackageVersion "requests" "2.31.0"
44-
checkPythonPackageVersion "cryptography" "41.0.2"
43+
# checkPythonPackageVersion "cryptography" "41.0.2" # Disabled temporarily due to issue with conda
4544
checkPythonPackageVersion "torch" "1.13.1"
4645
checkPythonPackageVersion "transformers" "4.30.0"
4746
checkPythonPackageVersion "mpmath" "1.3.0"
@@ -52,7 +51,7 @@ tornado_version=$(python -c "import tornado; print(tornado.version)")
5251
check-version-ge "tornado-requirement" "${tornado_version}" "6.3.2"
5352

5453
checkCondaPackageVersion "pyopenssl" "23.2.0"
55-
checkCondaPackageVersion "cryptography" "41.0.2"
54+
# checkCondaPackageVersion "cryptography" "41.0.2" # Disabled temporarily due to issue with conda
5655
checkCondaPackageVersion "requests" "2.31.0"
5756
checkCondaPackageVersion "pygments" "2.15.1"
5857
checkCondaPackageVersion "mpmath" "1.3.0"

src/miniconda/.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ RUN if [ -f "/tmp/conda-tmp/environment.yml" ]; then umask 0002 && /opt/conda/bi
4444
RUN conda install \
4545
# https://github.com/pyca/cryptography/security/advisories/GHSA-5cpq-8wj7-hf2v
4646
pyopenssl=23.2.0 \
47-
cryptography=41.0.2 \
47+
# cryptography=41.0.2 # Disabled temporarily due to issue with conda \
4848
# https://github.com/advisories/GHSA-j8r2-6x86-q33q
4949
requests=2.31.0
5050

src/miniconda/test-project/test.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ check "gitconfig-contains-name" sh -c "cat /etc/gitconfig | grep 'name = devcont
1818

1919
check "usr-local-etc-config-does-not-exist" test ! -f "/usr/local/etc/gitconfig"
2020

21-
checkPythonPackageVersion "cryptography" "41.0.0"
21+
# checkPythonPackageVersion "cryptography" "41.0.0" # Disabled temporarily due to issue with conda
2222
checkPythonPackageVersion "setuptools" "65.5.1"
2323
checkPythonPackageVersion "wheel" "0.38.1"
2424

25-
checkCondaPackageVersion "cryptography" "41.0.0"
25+
# checkCondaPackageVersion "cryptography" "41.0.0" # Disabled temporarily due to issue with conda
2626
checkCondaPackageVersion "pyopenssl" "23.2.0"
2727
checkCondaPackageVersion "setuptools" "65.5.1"
2828
checkCondaPackageVersion "wheel" "0.38.1"

0 commit comments

Comments
 (0)