From be627ae684c229fc61d80854f548faf0ccfb5d70 Mon Sep 17 00:00:00 2001 From: Min RK Date: Fri, 16 Aug 2024 12:26:24 +0200 Subject: [PATCH 1/2] explicitly exclude defaults channel make sure we're always using conda-forge it's unlikely any packages came from defaults for users (will only happen for packages not on conda-forge, and would often result in a broken env anyway), but this ensures defaults channel is opt-in. --- repo2docker/buildpacks/conda/install-base-env.bash | 1 - 1 file changed, 1 deletion(-) diff --git a/repo2docker/buildpacks/conda/install-base-env.bash b/repo2docker/buildpacks/conda/install-base-env.bash index 59e65a93..4bd3add9 100755 --- a/repo2docker/buildpacks/conda/install-base-env.bash +++ b/repo2docker/buildpacks/conda/install-base-env.bash @@ -30,7 +30,6 @@ export PATH="${PWD}/bin:$PATH" cat <> ${CONDA_DIR}/.condarc channels: - conda-forge - - defaults auto_update_conda: false show_channel_urls: true update_dependencies: false From 288074d88aaf79931b8d1f5aaeb268a09179ce42 Mon Sep 17 00:00:00 2001 From: Min RK Date: Fri, 16 Aug 2024 13:23:13 +0200 Subject: [PATCH 2/2] channel priority resolves downgrade a little differently --- tests/conda/downgrade/verify | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/conda/downgrade/verify b/tests/conda/downgrade/verify index 07b40940..2c69b3e8 100755 --- a/tests/conda/downgrade/verify +++ b/tests/conda/downgrade/verify @@ -27,4 +27,4 @@ assert pkgs["xeus-cling"]["version"] == "0.6.0" # which in turn downgrades Python from >=3.9.16 to 3.9.6 assert pkgs["openssl"]["version"].startswith("1.1.1"), pkgs["openssl"]["version"] -assert pkgs["python"]["version"] == "3.9.6", pkgs["python"]["version"] +assert pkgs["python"]["version"] == "3.9.0", pkgs["python"]["version"]