Skip to content

Commit

Permalink
Revert: Anaconda: Adds back 'anaconda' pkg (#584)
Browse files Browse the repository at this point in the history
* Revert "Anaconda: Adds back 'anaconda' pkg (#580)"

This reverts commit 29e670e.

* Update manifest
  • Loading branch information
samruddhikhandale committed Jun 2, 2023
1 parent 613283b commit 4d7d71e
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 12 deletions.
4 changes: 0 additions & 4 deletions src/anaconda/.devcontainer/Dockerfile
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
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
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

0 comments on commit 4d7d71e

Please sign in to comment.