Skip to content

Commit 444888a

Browse files
[miniconda] Enable patch for GHSA-5cpq-8wj7-hf2v (devcontainers#740)
* Enable patch for GHSA-5cpq-8wj7-hf2v * Enable tests * Update tests - Bump required version; - Remove comments. * Update tests
1 parent daabdeb commit 444888a

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

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 # Disabled temporarily due to issue with conda \
47+
cryptography=41.0.2 \
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" # Disabled temporarily due to issue with conda
21+
checkPythonPackageVersion "cryptography" "41.0.0"
2222
checkPythonPackageVersion "setuptools" "65.5.1"
2323
checkPythonPackageVersion "wheel" "0.38.1"
2424

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

0 commit comments

Comments
 (0)