Merge tag '9.7.beta7' into t/31505/tox_ini__add_macports_environment

SageMath version 9.7.beta7, Release Date: 2022-08-01

.github/workflows/build.yml

@@ -4,6 +4,15 @@ on:
   push:
   workflow_dispatch:
     # Allow to run manually
+    inputs:
+      platform:
+        description: 'Platform'
+        required: true
+        default: 'ubuntu-focal-standard'
+      docker_tag:
+        description: 'Docker tag'
+        required: true
+        default: 'dev'
 
 concurrency:
   # Cancel previous runs of this workflow for the same branch
@@ -13,52 +22,86 @@ concurrency:
 jobs:
   build:
     runs-on: ubuntu-latest
-    container: ghcr.io/sagemath/sage/sage-docker-ubuntu-focal-standard-with-targets:dev
+    container: ghcr.io/sagemath/sage/sage-docker-${{ github.event.inputs.platform || 'ubuntu-focal-standard' }}-with-targets:${{ github.event.inputs.docker_tag || 'dev'}}
     steps:
       - name: Checkout
+        id: checkout
         uses: actions/checkout@v2
 
+      - name: Prepare
+        id: prepare
+        run: |
+          # Install test tools.
+          if apt-get update && apt-get install -y git python3-venv; then
+             # Debian-specific temporary code:
+             # Installation of python3-venv can be removed as soon as a
+             # base image with a release including #33822 is available
+             :
+          else
+             export PATH="build/bin:$PATH"
+             eval $(sage-print-system-package-command auto update)
+             eval $(sage-print-system-package-command auto --spkg --yes --no-install-recommends install git)
+          fi
+          # Reuse built SAGE_LOCAL contained in the Docker image 
+          ./bootstrap
+          ./configure --enable-build-as-root --prefix=/sage/local --with-sage-venv --enable-editable --enable-download-from-upstream-url
+      
+      - name: Build and test modularized distributions
+        if: always() && steps.prepare.outcome == 'success'
+        run: make V=0 tox && make pypi-wheels
+        env:
+          MAKE: make -j2
+          SAGE_NUM_THREADS: 2
+
       - name: Set up node to install pyright
+        if: always() && steps.prepare.outcome == 'success'
         uses: actions/setup-node@v1
         with:
           node-version: '12'
 
       - name: Install pyright
+        if: always() && steps.prepare.outcome == 'success'
         # Fix to v232 due to bug https://github.com/microsoft/pyright/issues/3239
         run: npm install -g [email protected]
 
-      - name: Prepare
-        run: |
-          # Reuse built SAGE_LOCAL contained in the Docker image 
-          ./bootstrap
-          ./configure --enable-build-as-root --prefix=/sage/local --with-sage-venv --enable-editable --enable-download-from-upstream-url
-          # Install test tools
-          apt-get install -y git
-      
       - name: Static code check with pyright
+        if: always() && steps.prepare.outcome == 'success'
         run: pyright    
 
       - name: Build
+        id: build
+        if: always() && steps.prepare.outcome == 'success'
         run: make build
         env:
           MAKE: make -j2
           SAGE_NUM_THREADS: 2
 
+      - name: Pytest
+        if: contains(github.ref, 'pytest')
+        run: |
+          ../sage -python -m pip install coverage pytest-xdist
+          ../sage -python -m coverage run -m pytest -c tox.ini --doctest-modules || true
+        working-directory: ./src
+        env:
+          # Increase the length of the lines in the "short summary"
+          COLUMNS: 120
+
       - name: Test
+        if: always() && steps.build.outcome == 'success'
         run: |
           ../sage -python -m pip install coverage
           ../sage -python -m coverage run ./bin/sage-runtests --all -p2
         working-directory: ./src
 
       - name: Prepare coverage results
-        if: always()
+        if: always() && steps.build.outcome == 'success'
         run: |
           ./venv/bin/python3 -m coverage combine src/.coverage/
           ./venv/bin/python3 -m coverage xml
           find . -name *coverage*
       
       - name: Upload coverage to codecov
-        if: always()
+        if: always() && steps.build.outcome == 'success'
         uses: codecov/codecov-action@v2
         with:
           files: ./coverage.xml

.github/workflows/ci-conda.yml

@@ -43,15 +43,8 @@ jobs:
           bash ~/miniconda.sh -b -p $HOME/miniconda
           echo "CONDA=$HOME/miniconda" >> $GITHUB_ENV
 
-      - name: Install bootstrap prerequisites
-        run: |
-          export PATH="$(pwd)/build/bin:$PATH"
-          SYSTEM=$(sage-guess-package-system)
-          eval $(sage-print-system-package-command $SYSTEM --sudo install $(sage-get-system-packages $SYSTEM _bootstrap))
-
-      # Create conda environment file
-      - name: Bootstrap
-        run: ./bootstrap
+      - name: Create conda environment files
+        run: ./bootstrap-conda
 
       - name: Cache conda packages
         uses: actions/cache@v2
@@ -80,6 +73,7 @@ jobs:
         shell: bash -l {0}
         continue-on-error: true
         run: |
+          ./bootstrap
           echo "::add-matcher::.github/workflows/configure-systempackage-problem-matcher.json"
           ./configure --enable-build-as-root --with-python=$CONDA_PREFIX/bin/python --prefix=$CONDA_PREFIX $(for pkg in $(./sage -package list :standard: --has-file spkg-configure.m4 --has-file distros/conda.txt); do echo --with-system-$pkg=force; done)
           echo "::remove-matcher owner=configure-system-package-warning::"
@@ -88,8 +82,8 @@ jobs:
       - name: Build
         shell: bash -l {0}
         run: |
-          pip install --no-build-isolation -v -v -e pkgs/sage-conf pkgs/sage-setup 
-          pip install --no-build-isolation -v -v -e src
+          pip install --no-build-isolation -v -v -e ./pkgs/sage-conf ./pkgs/sage-setup
+          pip install --no-build-isolation -v -v -e ./src
         env:
           SAGE_NUM_THREADS: 2