Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/conda/devcontainer-feature.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "conda",
"version": "1.2.5",
"version": "1.2.6",
"name": "Conda",
"description": "A cross-platform, language-agnostic binary package manager",
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/conda",
Expand Down
3 changes: 3 additions & 0 deletions src/conda/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,9 @@ if ! conda --version &> /dev/null ; then
install_user_package cryptography
# Due to https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-40897
install_user_package setuptools

install_user_package pluggy

fi

# Display a notice on conda when not running in GitHub Codespaces
Expand Down
14 changes: 14 additions & 0 deletions test/conda/conda_channel_creation.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#!/bin/bash

set -e

# Optional: Import test library
source dev-container-features-test-lib

## Test Conda
check "conda-update-conda" bash -c "conda update -c defaults -y conda"
check "conda-install-tensorflow" bash -c "conda create --name test-env -c conda-forge --yes tensorflow"
check "conda-install-pytorch" bash -c "conda create --name test-env -c conda-forge --yes pytorch"

# Report result
reportResults
18 changes: 18 additions & 0 deletions test/conda/install_conda_package_after_upgrade.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#!/bin/bash

set -e

# Optional: Import test library
source dev-container-features-test-lib

# Test that conda can install packages without pluggy incompatibility errors
# This validates the fix for the pluggy/conda version mismatch issue where
# conda self-upgrades but the older pluggy lacks the 'wrapper' attribute
check "conda version" conda --version
check "install pyopenssl" conda install -y -c defaults pyopenssl
check "install cryptography" conda install -y -c defaults cryptography
check "conda-forge" conda config --show channels | grep conda-forge
check "if conda-notice.txt exists" cat /usr/local/etc/vscode-dev-containers/conda-notice.txt

# Report result
reportResults
12 changes: 12 additions & 0 deletions test/conda/scenarios.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,17 @@
"addCondaForge": "true"
}
}
},
"install_conda_package_after_upgrade": {
"image": "ubuntu:noble",
"features": {
"conda": {}
}
},
"conda_channel_creation": {
"image": "ubuntu:noble",
"features": {
"conda": {}
}
}
}
Loading