Merge pull request #1313 from manics/upgrade-mamba

Upgrade mamba and refreeze
jupyterhub · Oct 19, 2023 · 8bdf681 · 8bdf681
2 parents aa57e01 + f459142
commit 8bdf681
Show file tree

Hide file tree

Showing 17 changed files with 986 additions and 924 deletions.
diff --git a/repo2docker/buildpacks/conda/environment.py-3.10-linux-64.lock b/repo2docker/buildpacks/conda/environment.py-3.10-linux-64.lock
diff --git a/repo2docker/buildpacks/conda/environment.py-3.10-linux-aarch64.lock b/repo2docker/buildpacks/conda/environment.py-3.10-linux-aarch64.lock
diff --git a/repo2docker/buildpacks/conda/environment.py-3.10.yml b/repo2docker/buildpacks/conda/environment.py-3.10.yml
@@ -1,5 +1,5 @@
 # AUTO GENERATED FROM environment.yml, DO NOT MANUALLY MODIFY
-# Generated on 2023-06-08 09:35:19 UTC
+# Generated on 2023-10-14 22:06:18 UTC
 channels:
 - conda-forge
 dependencies:

diff --git a/repo2docker/buildpacks/conda/environment.py-3.11-linux-64.lock b/repo2docker/buildpacks/conda/environment.py-3.11-linux-64.lock
diff --git a/repo2docker/buildpacks/conda/environment.py-3.11-linux-aarch64.lock b/repo2docker/buildpacks/conda/environment.py-3.11-linux-aarch64.lock
diff --git a/repo2docker/buildpacks/conda/environment.py-3.11.yml b/repo2docker/buildpacks/conda/environment.py-3.11.yml
@@ -1,5 +1,5 @@
 # AUTO GENERATED FROM environment.yml, DO NOT MANUALLY MODIFY
-# Generated on 2023-06-08 09:35:47 UTC
+# Generated on 2023-10-14 22:06:48 UTC
 channels:
 - conda-forge
 dependencies:

diff --git a/repo2docker/buildpacks/conda/environment.py-3.7-linux-64.lock b/repo2docker/buildpacks/conda/environment.py-3.7-linux-64.lock
diff --git a/repo2docker/buildpacks/conda/environment.py-3.7-linux-aarch64.lock b/repo2docker/buildpacks/conda/environment.py-3.7-linux-aarch64.lock
diff --git a/repo2docker/buildpacks/conda/environment.py-3.7.yml b/repo2docker/buildpacks/conda/environment.py-3.7.yml
@@ -1,5 +1,5 @@
 # AUTO GENERATED FROM environment.yml, DO NOT MANUALLY MODIFY
-# Generated on 2023-06-08 09:33:53 UTC
+# Generated on 2023-10-14 22:04:48 UTC
 channels:
 - conda-forge
 dependencies:

diff --git a/repo2docker/buildpacks/conda/environment.py-3.8-linux-64.lock b/repo2docker/buildpacks/conda/environment.py-3.8-linux-64.lock
diff --git a/repo2docker/buildpacks/conda/environment.py-3.8-linux-aarch64.lock b/repo2docker/buildpacks/conda/environment.py-3.8-linux-aarch64.lock
diff --git a/repo2docker/buildpacks/conda/environment.py-3.8.yml b/repo2docker/buildpacks/conda/environment.py-3.8.yml
@@ -1,5 +1,5 @@
 # AUTO GENERATED FROM environment.yml, DO NOT MANUALLY MODIFY
-# Generated on 2023-06-08 09:34:21 UTC
+# Generated on 2023-10-14 22:05:18 UTC
 channels:
 - conda-forge
 dependencies:

diff --git a/repo2docker/buildpacks/conda/environment.py-3.9-linux-64.lock b/repo2docker/buildpacks/conda/environment.py-3.9-linux-64.lock
diff --git a/repo2docker/buildpacks/conda/environment.py-3.9-linux-aarch64.lock b/repo2docker/buildpacks/conda/environment.py-3.9-linux-aarch64.lock
diff --git a/repo2docker/buildpacks/conda/environment.py-3.9.yml b/repo2docker/buildpacks/conda/environment.py-3.9.yml
@@ -1,5 +1,5 @@
 # AUTO GENERATED FROM environment.yml, DO NOT MANUALLY MODIFY
-# Generated on 2023-06-08 09:34:51 UTC
+# Generated on 2023-10-14 22:05:49 UTC
 channels:
 - conda-forge
 dependencies:

diff --git a/repo2docker/buildpacks/conda/install-base-env.bash b/repo2docker/buildpacks/conda/install-base-env.bash
@@ -5,8 +5,8 @@ set -ex
 
 cd $(dirname $0)
 
-export MAMBA_VERSION=1.4.9
-export CONDA_VERSION=23.5.2
+export MAMBA_VERSION=1.5.1
+export CONDA_VERSION=23.7.4
 
 URL="https://anaconda.org/conda-forge/micromamba/${MAMBA_VERSION}/download/${CONDA_PLATFORM}/micromamba-${MAMBA_VERSION}-0.tar.bz2"
 

diff --git a/tests/conda/py35-binder-dir/verify b/tests/conda/py35-binder-dir/verify
@@ -16,13 +16,13 @@ v = out.split()[1]
 assert v[:3] == "3.5", out
 
 out = sh(["micromamba", "--version"])
-assert out == "1.4.9", out
+assert out == "1.5.1", out
 
 out = sh(["mamba", "--version"])
 assert (
     out
-    == """mamba 1.4.9
-conda 23.5.2"""
+    == """mamba 1.5.1
+conda 23.7.4"""
 ), out
 
 sh([kernel_python, "-c", "import numpy"])