Use conda-lock for reproducible conda env

.devcontainer/onCreate-conda.sh

@@ -2,9 +2,8 @@
 set -e
 
 # Create conda environment
-./bootstrap-conda
 conda install mamba -n base -c conda-forge -y
-mamba env create --file src/environment-dev.yml || mamba env update --file src/environment-dev.yml
+mamba env create --file src/environment-dev-3.11-linux.yml || mamba env update --file src/environment-dev-3.11-linux.yml
 conda init bash
 
 # Build sage

.github/workflows/ci-conda.yml

@@ -20,7 +20,7 @@ concurrency:
 jobs:
   test:
     name: Conda
-    runs-on: ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}-latest
 
     # Run on push, workflow dispatch and when certain labels are added 
     if: |
@@ -32,7 +32,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest]
+        os: [ubuntu, macos]
         python: ['3.9', '3.10', '3.11']
         # Optional environment is disabled for now as its not yet working
         # environment: [environment, environment-optional]
@@ -53,9 +53,6 @@ jobs:
           bash ~/miniconda.sh -b -p $HOME/miniconda
           echo "CONDA=$HOME/miniconda" >> $GITHUB_ENV
 
-      - name: Create conda environment files
-        run: ./bootstrap-conda
-
       - name: Cache conda packages
         uses: actions/cache@v3
         with:
@@ -71,7 +68,7 @@ jobs:
           channels: conda-forge,defaults
           channel-priority: true
           activate-environment: sage-build
-          environment-file: src/${{ matrix.conda-env }}.yml
+          environment-file: src/${{ matrix.conda-env }}-${{ matrix.python }}-${{ matrix.os }}.yml
 
       - name: Print Conda environment
         shell: bash -l {0}

.gitignore

@@ -27,11 +27,21 @@
 # no longer generated, but may still be in user worktrees
 /src/lib/pkgconfig
 
-/environment.yml
-/environment-optional.yml
-/src/environment.yml
-/src/environment-dev.yml
-/src/environment-optional.yml
+/environment-3.9.yml
+/environment-3.10.yml
+/environment-3.11.yml
+/environment-optional-3.9.yml
+/environment-optional-3.10.yml
+/environment-optional-3.11.yml
+/src/environment-3.9.yml
+/src/environment-3.10.yml
+/src/environment-3.11.yml
+/src/environment-dev-3.9.yml
+/src/environment-dev-3.10.yml
+/src/environment-dev-3.11.yml
+/src/environment-optional-3.9.yml
+/src/environment-optional-3.10.yml
+/src/environment-optional-3.11.yml
 
 /src/setup.cfg
 /src/requirements.txt

.gitpod.yml

@@ -7,8 +7,7 @@ tasks:
   - name: Setup
     # Create conda environment, then configure and build sage
     init: >-
-      ./bootstrap-conda
-      && mamba env create --file src/environment-dev.yml --prefix venv
+      && mamba env create --file src/environment-dev-3.11-linux.yml --prefix venv
       && conda config --append envs_dirs $(pwd)
       && conda activate $(pwd)/venv
       && ./bootstrap

bootstrap-conda

@@ -51,72 +51,76 @@ for PKG_BASE in $(sage-package list --has-file distros/conda.txt --exclude _sage
     fi
 done
 echo >&2 $0:$LINENO: generate conda environment files
-(
-    echo "name: sage-build"
-    echo "channels:"
-    echo "  - conda-forge"
-    echo "  - nodefaults"
-    echo "dependencies:"
-    for pkg in $SYSTEM_PACKAGES; do
-        echo "  - $pkg"
-    done
-    echo "  # Packages needed for ./bootstrap"
-    for pkg in $BOOTSTRAP_PACKAGES; do
-        echo "  - $pkg"
-    done
-) > environment.yml
+for python_version in 3.9 3.10 3.11; do
+    (
+        echo "name: sage-build"
+        echo "channels:"
+        echo "  - conda-forge"
+        echo "  - nodefaults"
+        echo "dependencies:"
+        echo "  - python=$python_version"
+        for pkg in $SYSTEM_PACKAGES; do
+            echo "  - $pkg"
+        done
+        echo "  # Packages needed for ./bootstrap"
+        for pkg in $BOOTSTRAP_PACKAGES; do
+            echo "  - $pkg"
+        done
+    ) > environment-$python_version.yml
+    (
+        sed 's/name: sage-build/name: sage/' environment-$python_version.yml
+        echo "  # Additional packages providing all dependencies for the Sage library"
+        for pkg in $SAGELIB_SYSTEM_PACKAGES; do
+            echo "  - $pkg"
+        done
+    ) > src/environment-$python_version.yml
+    (
+        sed 's/name: sage/name: sage-dev/' src/environment-$python_version.yml
+        echo "  # Additional dev tools"
+        for pkg in $DEVELOP_SYSTEM_PACKAGES; do
+            echo "  - $pkg"
+        done
+    ) > src/environment-dev-$python_version.yml
 
-(
-    sed 's/name: sage-build/name: sage/' environment.yml
-    echo "  # Additional packages providing all dependencies for the Sage library"
-    for pkg in $SAGELIB_SYSTEM_PACKAGES; do
-        echo "  - $pkg"
-    done
-) > src/environment.yml
+    (
+        cat environment-$python_version.yml
+        echo "  # optional packages"
+        for pkg in $OPTIONAL_SYSTEM_PACKAGES; do
+            echo "  - $pkg"
+        done
+    ) > environment-optional-$python_version.yml
 
-(
-    sed 's/name: sage/name: sage-dev/' src/environment.yml
-    echo "  # Additional dev tools"
-    for pkg in $DEVELOP_SYSTEM_PACKAGES; do
-        echo "  - $pkg"
-    done
-) > src/environment-dev.yml
-
-(
-    cat environment.yml
-    echo "  # optional packages"
-    for pkg in $OPTIONAL_SYSTEM_PACKAGES; do
-        echo "  - $pkg"
-    done
-) > environment-optional.yml
+    (
+        cat src/environment-$python_version.yml
+        echo "  # optional packages"
+        for pkg in $OPTIONAL_SYSTEM_PACKAGES $SAGELIB_OPTIONAL_SYSTEM_PACKAGES; do
+            echo "  - $pkg"
+        done
+    ) > src/environment-optional-$python_version.yml
+    (
+        echo >&4 "  - pip:"
+        echo >&5 "  - pip:"
+        for PKG_BASE in $((sage-package list :standard: :optional: --has-file requirements.txt --no-file distros/conda.txt --no-file src; sage-package list :standard: :optional: --has-file install-requires.txt --no-file requirements.txt --no-file distros/conda.txt --no-file src) | sort); do
+            PKG_SCRIPTS=build/pkgs/$PKG_BASE
+            SYSTEM_PACKAGES_FILE=$PKG_SCRIPTS/requirements.txt
+            if [ ! -f $SYSTEM_PACKAGES_FILE ]; then
+                SYSTEM_PACKAGES_FILE=$PKG_SCRIPTS/install-requires.txt
+            fi
+            PKG_TYPE=$(cat $PKG_SCRIPTS/type)
+            if grep -q SAGERUNTIME $PKG_SCRIPTS/dependencies $PKG_SCRIPTS/dependencies_order_only 2>/dev/null; then
+                : # cannot install packages that depend on the Sage library
+            else
+                case "$PKG_BASE:$PKG_TYPE" in
+                    $DEVELOP_SPKG_PATTERN:*) FD=4;;
+                    *)                       FD=5;;
+                esac
+                ${STRIP_COMMENTS} $SYSTEM_PACKAGES_FILE | while read -r line; do
+                    [ -n "$line" ] && echo >&$FD "    - $line"
+                done
+            fi
+        done
+    # Currently, there are no dev-python packages, so we do not write an empty pip section
+    #) 4>> src/environment-dev-$python_version.yml 5>> src/environment-optional-$python_version.yml
+    ) 4>> /dev/null 5>> src/environment-optional-$python_version.yml
+done
 
-(
-    cat src/environment.yml
-    echo "  # optional packages"
-    for pkg in $OPTIONAL_SYSTEM_PACKAGES $SAGELIB_OPTIONAL_SYSTEM_PACKAGES; do
-        echo "  - $pkg"
-    done
-) > src/environment-optional.yml
-(
-    echo >&4 "  - pip:"
-    echo >&5 "  - pip:"
-    for PKG_BASE in $((sage-package list :standard: :optional: --has-file requirements.txt --no-file distros/conda.txt --no-file src; sage-package list :standard: :optional: --has-file install-requires.txt --no-file requirements.txt --no-file distros/conda.txt --no-file src) | sort); do
-        PKG_SCRIPTS=build/pkgs/$PKG_BASE
-        SYSTEM_PACKAGES_FILE=$PKG_SCRIPTS/requirements.txt
-        if [ ! -f $SYSTEM_PACKAGES_FILE ]; then
-            SYSTEM_PACKAGES_FILE=$PKG_SCRIPTS/install-requires.txt
-        fi
-        PKG_TYPE=$(cat $PKG_SCRIPTS/type)
-        if grep -q SAGERUNTIME $PKG_SCRIPTS/dependencies $PKG_SCRIPTS/dependencies_order_only 2>/dev/null; then
-            : # cannot install packages that depend on the Sage library
-        else
-            case "$PKG_BASE:$PKG_TYPE" in
-                $DEVELOP_SPKG_PATTERN:*) FD=4;;
-                *)                       FD=5;;
-            esac
-            ${STRIP_COMMENTS} $SYSTEM_PACKAGES_FILE | while read -r line; do
-                [ -n "$line" ] && echo >&$FD "    - $line"
-            done
-        fi
-    done
-) 4>> src/environment-dev.yml 5>> src/environment-optional.yml

build/pkgs/cython/distros/conda.txt

@@ -1 +1 @@
-cython
+cython<3.0.0

build/pkgs/matplotlib/distros/conda.txt

@@ -1,2 +1,2 @@
 # Trac #33642: For unknown reasons, without the version constraint, conda installs only 3.3.2
-"matplotlib>=3.5.1"
+matplotlib>=3.5.1

build/pkgs/setuptools/distros/conda.txt

@@ -1,4 +1,4 @@
 # Set this bound until https://github.com/sagemath/sage/issues/34209 adds support for PEP660 editable builds
 # By setting this version bound, we avoid having to include the following in our installation instructions.
 #   export SETUPTOOLS_ENABLE_FEATURES=legacy-editable
-"setuptools<64"
+setuptools<64

build/pkgs/sphinx/distros/conda.txt

@@ -1 +1 @@
-sphinx<8,>=5.2
+sphinx>=5.2