Merge branch 'main' into deprecate-noarch_python_build_age

conda · Apr 18, 2024 · 1347bb4 · 1347bb4
2 parents 76710c5 + a6d53af
commit 1347bb4
Show file tree

Hide file tree

Showing 42 changed files with 815 additions and 536 deletions.
diff --git a/.devcontainer/post_create.sh b/.devcontainer/post_create.sh
@@ -24,4 +24,4 @@ echo "Installing dev dependencies"
     --file "$SRC_CONDA_BUILD/tests/requirements.txt" \
     --file "$SRC_CONDA_BUILD/tests/requirements-Linux.txt" \
     --file "$SRC_CONDA_BUILD/tests/requirements-ci.txt" \
-    "conda>=23.5.0"
+    "conda>=23.7.0"
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -83,10 +83,10 @@ jobs:
         include:
           # minimum Python/conda combo
           - python-version: '3.8'
-            conda-version: 23.5.0
+            conda-version: 23.7.0
             test-type: serial
           - python-version: '3.8'
-            conda-version: 23.5.0
+            conda-version: 23.7.0
             test-type: parallel
           # maximum Python/conda combo
           - python-version: '3.12'