Skip to content

Commit 4d7d71e

Browse files
Revert: Anaconda: Adds back 'anaconda' pkg (#584)
* Revert "Anaconda: Adds back 'anaconda' pkg (#580)" This reverts commit 29e670e. * Update manifest
1 parent 613283b commit 4d7d71e

File tree

3 files changed

+1
-12
lines changed

3 files changed

+1
-12
lines changed

src/anaconda/.devcontainer/Dockerfile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,6 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
4343
&& echo "conda activate base" >> ~/.bashrc \
4444
&& apt-get clean -y && rm -rf /var/lib/apt/lists/* /tmp/library-scripts/add-notice.sh
4545

46-
# Since anaconda distribution 2023.03-1, continuumio/anaconda3 image no more contains `anaconda` pkg.
47-
RUN conda update -n base -c defaults conda \
48-
&& conda install --yes anaconda
49-
5046
# Temporary: Upgrade python packages due to mentioned CVEs
5147
# They are installed by the base image (continuumio/anaconda3) which does not have the patch.
5248
RUN python3 -m pip install \

src/anaconda/manifest.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,6 @@
4444
"conda": {
4545
"cgIgnore": true,
4646
"path": "/opt/conda"
47-
},
48-
"anaconda": {
49-
"cgIgnore": true,
50-
"path": "/opt/conda",
51-
"versionCommand": "conda list anaconda$ | grep -oP 'anaconda\\s+\\K[^\\s]+'"
5247
}
5348
},
5449
"languages": {

src/anaconda/test-project/test.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ checkCommon
88

99
# Image specific tests
1010
check "conda" conda --version
11-
check "anaconda" bash -c "conda list anaconda$ | grep -oP 'anaconda\\s+\\K[^\\s]+'"
1211
check "python" python --version
1312
check "pylint" pylint --version
1413
check "flake8" flake8 --version
@@ -43,8 +42,7 @@ checkPythonPackageVersion "werkzeug" "2.2.3"
4342
checkPythonPackageVersion "certifi" "2022.12.07"
4443
checkPythonPackageVersion "requests" "2.31.0"
4544

46-
# https://github.com/conda/conda/issues/8149
47-
check "conda-update-conda" bash -c "conda update --force conda"
45+
check "conda-update-conda" bash -c "conda update -y conda"
4846
check "conda-install" bash -c "conda install -c conda-forge --yes tensorflow"
4947
check "conda-install" bash -c "conda install -c conda-forge --yes pytorch"
5048

0 commit comments

Comments
 (0)