Skip to content

Revert: Anaconda: Adds back 'anaconda' pkg #584

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 2, 2023
Merged

Revert: Anaconda: Adds back 'anaconda' pkg #584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50bbdb7
Revert "Anaconda: Adds back 'anaconda' pkg (#580)"
samruddhikhandale Jun 2, 2023
373e201
Update manifest
samruddhikhandale Jun 2, 2023
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
4 changes: 0 additions & 4 deletions src/anaconda/.devcontainer/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,6 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
&& echo "conda activate base" >> ~/.bashrc \
&& apt-get clean -y && rm -rf /var/lib/apt/lists/* /tmp/library-scripts/add-notice.sh

# Since anaconda distribution 2023.03-1, continuumio/anaconda3 image no more contains `anaconda` pkg.
RUN conda update -n base -c defaults conda \
&& conda install --yes anaconda

# Temporary: Upgrade python packages due to mentioned CVEs
# They are installed by the base image (continuumio/anaconda3) which does not have the patch.
RUN python3 -m pip install \
Expand Down
5 changes: 0 additions & 5 deletions src/anaconda/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,6 @@
"conda": {
"cgIgnore": true,
"path": "/opt/conda"
},
"anaconda": {
"cgIgnore": true,
"path": "/opt/conda",
"versionCommand": "conda list anaconda$ | grep -oP 'anaconda\\s+\\K[^\\s]+'"
}
},
"languages": {
Expand Down
4 changes: 1 addition & 3 deletions src/anaconda/test-project/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ checkCommon

# Image specific tests
check "conda" conda --version
check "anaconda" bash -c "conda list anaconda$ | grep -oP 'anaconda\\s+\\K[^\\s]+'"
check "python" python --version
check "pylint" pylint --version
check "flake8" flake8 --version
Expand Down Expand Up @@ -43,8 +42,7 @@ checkPythonPackageVersion "werkzeug" "2.2.3"
checkPythonPackageVersion "certifi" "2022.12.07"
checkPythonPackageVersion "requests" "2.31.0"

# https://github.com/conda/conda/issues/8149
check "conda-update-conda" bash -c "conda update --force conda"
check "conda-update-conda" bash -c "conda update -y conda"
check "conda-install" bash -c "conda install -c conda-forge --yes tensorflow"
check "conda-install" bash -c "conda install -c conda-forge --yes pytorch"

Expand Down