Merge branch 'develop' into remove-spurious-doc-diffs

Author: kwankyu

.github/workflows/build.yml

@@ -85,20 +85,19 @@ jobs:
             (cd worktree-image && git commit -q -m "current changes" --allow-empty -a && git am; git reset --quiet old; git add -N .) < upstream/ci_fixes.patch
           fi
 
-      - name: Incremental build, test changed files (sage -t --new)
+      - name: Incremental build
         id: incremental
         run: |
           # Now re-bootstrap and build. The build is incremental because we were careful with the timestamps.
-          # We run tests with "sage -t --new"; this only tests the uncommitted changes.
-          ./bootstrap && make build && ./sage -t --new -p2
+          ./bootstrap && make build
         working-directory: ./worktree-image
         env:
           MAKE: make -j2 --output-sync=recurse
           SAGE_NUM_THREADS: 2
 
-      - name: Build and test modularized distributions
+      - name: Build modularized distributions
         if: always() && steps.worktree.outcome == 'success'
-        run: make V=0 tox && make pypi-wheels
+        run: make V=0 tox && make SAGE_CHECK=no pypi-wheels
         working-directory: ./worktree-image
         env:
           MAKE: make -j2 --output-sync=recurse
@@ -143,6 +142,26 @@ jobs:
           MAKE: make -j2 --output-sync=recurse
           SAGE_NUM_THREADS: 2
 
+      # Testing
+
+      - name: Test changed files (sage -t --new)
+        if: always() && steps.build.outcome == 'success'
+        run: |
+          # We run tests with "sage -t --new"; this only tests the uncommitted changes.
+          ./sage -t --new -p2
+        working-directory: ./worktree-image
+        env:
+          MAKE: make -j2 --output-sync=recurse
+          SAGE_NUM_THREADS: 2
+
+      - name: Test modularized distributions
+        if: always() && steps.build.outcome == 'success'
+        run: make V=0 tox && make pypi-wheels-check
+        working-directory: ./worktree-image
+        env:
+          MAKE: make -j2 --output-sync=recurse
+          SAGE_NUM_THREADS: 2
+
       - name: Pytest
         if: contains(github.ref, 'pytest')
         run: |

.github/workflows/ci-conda.yml

@@ -39,18 +39,6 @@ jobs:
         env:
           GH_TOKEN: ${{ github.token }}
 
-      - name: Check for Miniconda
-        id: check_conda
-        run: echo ::set-output name=installed::$CONDA
-
-      # Miniconda is installed by default in the ubuntu-latest, however not in the act-image to run it locally
-      - name: Install Miniconda
-        if: steps.check_conda.outputs.installed == ''
-        run: |
-          wget https://repo.anaconda.com/miniconda/Miniconda3-py39_4.10.3-Linux-x86_64.sh -O ~/miniconda.sh
-          bash ~/miniconda.sh -b -p $HOME/miniconda
-          echo "CONDA=$HOME/miniconda" >> $GITHUB_ENV
-
       - name: Create conda environment files
         run: ./bootstrap-conda
 
@@ -61,12 +49,13 @@ jobs:
           key:
             ${{ runner.os }}-conda-${{ hashFiles('src/environment-3.11.yml') }}
 
-      - name: Setup Conda
+      - name: Setup Conda environment
         uses: conda-incubator/setup-miniconda@v2
         with:
           python-version: ${{ matrix.python }}
-          mamba-version: "*"
-          channels: conda-forge,defaults
+          miniforge-version: latest
+          use-mamba: true
+          channels: conda-forge
           channel-priority: true
           activate-environment: sage
           environment-file: src/${{ matrix.conda-env }}-${{ matrix.python }}.yml
@@ -92,7 +81,7 @@ jobs:
         run: |
           # Use --no-deps and pip check below to verify that all necessary dependencies are installed via conda.
           pip install --no-build-isolation --no-deps -v -v -e ./pkgs/sage-conf ./pkgs/sage-setup
-          pip install --no-build-isolation --no-deps -v -v -e ./src
+          pip install --no-build-isolation --no-deps --config-settings editable_mode=compat -v -v -e ./src
         env:
           SAGE_NUM_THREADS: 2
 

.github/workflows/ci-linux.yml

@@ -34,7 +34,46 @@ permissions:
 
 jobs:
 
+  # standard-pre for the default platform (used by build.yml etc.)
+  default-pre:
+    uses: ./.github/workflows/docker.yml
+    with:
+      # Build from scratch
+      docker_targets: "with-system-packages configured with-targets-pre"
+      # FIXME: duplicated from env.TARGETS
+      targets_pre: all-sage-local
+      tox_system_factors: >-
+        ["ubuntu-focal"]
+      tox_packages_factors: >-
+        ["standard"]
+      docker_push_repository: ghcr.io/${{ github.repository }}/
+
+  # standard for the default platform (used by build.yml etc.)
+  default:
+    if: ${{ success() || failure() }}
+    needs: [default-pre]
+    uses: ./.github/workflows/docker.yml
+    with:
+      # Build incrementally from previous stage (pre)
+      incremental: true
+      free_disk_space: true
+      from_docker_repository: ghcr.io/${{ github.repository }}/
+      from_docker_target: "with-targets-pre"
+      docker_targets: "with-targets with-targets-optional"
+      # FIXME: duplicated from env.TARGETS
+      targets: build doc-html
+      targets_optional: ptest
+      tox_system_factors: >-
+        ["ubuntu-focal"]
+      tox_packages_factors: >-
+          ["standard"]
+      docker_push_repository: ghcr.io/${{ github.repository }}/
+
+  # All platforms. This duplicates the default platform, but why not,
+  # it makes it more robust regarding random timeouts.
+
   standard-pre:
+    if: ${{ success() || failure() }}
     uses: ./.github/workflows/docker.yml
     with:
       # Build from scratch

.github/workflows/dist.yml

@@ -18,9 +18,8 @@ jobs:
 
   release_dist:
 
-    # This job, in contrast to "dist" in ci-macos.yml,
-    # does not use "configure --enable-download-from-upstream-url"
-    # (the default since #32390).
+    # This job first checks whether "configure --enable-download-from-upstream-url"
+    # (the default since #32390) is needed.
     #
     # In this way, we check that all necessary package tarballs
     # have already been uploaded to the Sage server at the time
@@ -37,13 +36,42 @@ jobs:
         run: |
           sudo DEBIAN_FRONTEND=noninteractive apt-get update
           sudo DEBIAN_FRONTEND=noninteractive apt-get install $(build/bin/sage-get-system-packages debian _bootstrap)
-      - name: make dist
+      - name: make dist (--disable-download-from-upstream-url)
         run: |
           ./bootstrap -D && ./configure --disable-download-from-upstream-url && make dist
+        env:
+          MAKE: make -j8
+      - name: make dist (--enable-download-from-upstream-url)
+        if: failure()
+        run: |
+          ./configure && make dist
+        env:
+          MAKE: make -j8
       - uses: actions/upload-artifact@v3
+        if: success() || failure()
+        with:
+          path: |
+            dist/*.tar.gz
+            upstream
+          name: release_dist
+
+  release:
+
+    needs: release_dist
+    runs-on: ubuntu-latest
+    if: (success() || failure()) && github.repository == 'sagemath/sage' && startsWith(github.ref, 'refs/tags/') && !contains(github.ref, 'beta') && !contains(github.ref, 'rc')
+    steps:
+      - uses: actions/download-artifact@v3
         with:
-          path: "dist/*.tar.gz"
           name: release_dist
+      - uses: softprops/action-gh-release@v1
+        with:
+          generate_release_notes: true
+          files: |
+            dist/*
+            upstream/*
+    permissions:
+      contents: write
 
   sdists_for_pypi:
 

.github/workflows/docker.yml

@@ -51,6 +51,7 @@ on:
            "almalinux-9-python3.11",
            "gentoo-python3.10",
            "gentoo-python3.11",
+           "gentoo-python3.12",
            "archlinux-latest",
            "opensuse-15.3-gcc_11-python3.9",
            "opensuse-15.4-gcc_11-python3.10",

.github/workflows/lint.yml

@@ -14,60 +14,32 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  lint-pycodestyle:
-    name: Code style check with pycodestyle
+  lint:
+    name: Lint
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
       uses: actions/checkout@v4
+
     - name: Merge CI fixes from sagemath/sage
       run: |
         .ci/merge-fixes.sh
       env:
         GH_TOKEN: ${{ github.token }}
+
     - name: Set up Python
       uses: actions/setup-python@v4
       with:
         python-version: 3.9
-    - name: Install pycodestyle
-      run: pip install tox pycodestyle
-    - name: Lint using pycodestyle
+
+    - name: Install dependencies
+      run: pip install tox pycodestyle relint
+
+    - name: Code style check with pycodestyle
       run: tox -e pycodestyle-minimal
-  lint-relint:
-    name: Code style check with relint
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-    - name: Merge CI fixes from sagemath/sage
-      run: |
-        .ci/merge-fixes.sh
-      env:
-        GH_TOKEN: ${{ github.token }}
-    - name: Set up Python
-      uses: actions/setup-python@v4
-      with:
-        python-version: 3.9
-    - name: Install relint
-      run: pip install tox relint
-    - name: Lint using relint
+
+    - name: Code style check with relint
       run: tox -e relint -- src/sage/
-  lint-rst:
-    name: Validate docstring markup as RST
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-    - name: Merge CI fixes from sagemath/sage
-      run: |
-        .ci/merge-fixes.sh
-      env:
-        GH_TOKEN: ${{ github.token }}
-    - name: Set up Python
-      uses: actions/setup-python@v4
-      with:
-        python-version: 3.9
-    - name: Install tox
-      run: pip install tox
-    - name: Lint using tox -e rst
+
+    - name: Validate docstring markup as RST
       run: tox -e rst

.github/workflows/push_to_docker_hub.yml

@@ -5,7 +5,6 @@ on:
     # Allow to run manually
     branches:
       - 'develop'
-      - 'docker_hub_gha'
   push:
     tags:
       # Just create image on pushing a tag
@@ -14,6 +13,7 @@ on:
 jobs:
   sagemath-dev:
     name: Build Docker image on target make-build and push to DockerHub sagemath-dev
+    # target make-build replaces former sagemath-dev, see https://github.com/sagemath/sage/pull/36047
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -25,10 +25,9 @@ jobs:
         id: set_tag
         run: |
           git fetch --depth=1 origin +refs/tags/*:refs/tags/*
-          TAG_NAME=$(git tag --sort=v:refname | tail -1)
+          TAG_NAME=$(git tag --sort=creatordate | tail -1)
           TAG="sagemath/sagemath-dev:$TAG_NAME"
           TAG_LIST="$TAG, sagemath/sagemath-dev:develop"
-          TAG_LIST="$TAG" # don't tag develop until meaning of sagemath-dev is clear
           echo "TAG_NAME=$TAG_NAME" >> $GITHUB_ENV
           echo "TAG=$TAG" >> $GITHUB_ENV
           echo "TAG_LIST=$TAG_LIST" >> $GITHUB_ENV
@@ -37,30 +36,20 @@ jobs:
         id: upd_tag_list
         run: |
           TAG_LIST="${{ env.TAG_LIST }}, sagemath/sagemath-dev:latest"
-          TAG_LIST="${{ env.TAG_LIST }}"  # don't tag latest until meaning of sagemath-dev is clear
           echo "TAG_LIST=$TAG_LIST" >> $GITHUB_ENV
         if: "!contains(env.TAG_NAME, 'beta') && !contains(env.TAG_NAME, 'rc')"
 
-      - name: Check env
-        run: |
-          echo ${{ env.TAG_NAME }}
-          echo ${{ env.TAG }}
-          echo ${{ env.TAG_LIST }}
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to Docker Hub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build and push make-build
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: docker/Dockerfile
@@ -84,7 +73,7 @@ jobs:
         id: set_tag
         run: |
           git fetch --depth=1 origin +refs/tags/*:refs/tags/*
-          TAG_NAME=$(git tag --sort=v:refname | tail -1)
+          TAG_NAME=$(git tag --sort=creatordate | tail -1)
           TAG="sagemath/sagemath:$TAG_NAME"
           TAG_LIST="$TAG, sagemath/sagemath:develop"
           BASE="sagemath/sagemath-dev:$TAG_NAME"
@@ -100,20 +89,17 @@ jobs:
           echo "TAG_LIST=$TAG_LIST" >> $GITHUB_ENV
         if: "!contains(env.TAG_NAME, 'beta') && !contains(env.TAG_NAME, 'rc')"
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to Docker Hub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build and push sagemath
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: docker/Dockerfile

.upstream.d/10-SAGE_SERVER

@@ -0,0 +1,2 @@
+# When SAGE_SERVER is set, it should be an https/https server in the format of Sage mirrors.
+${SAGE_SERVER}/spkg/upstream/${SPKG}/

.upstream.d/20-gitproxy.zycloud.tk-sagemath-sage-releases

@@ -0,0 +1,4 @@
+# Upstream packages as uploaded as GitHub release assets.
+# This file is automatically updated by the sage-update-version script.
+https://github.com/sagemath/sage/releases/download/10.2/
+https://github.com/sagemath/sage/releases/download/10.1/

.upstream.d/30-www.sagemath.org-mirror_list

@@ -0,0 +1 @@
+https://www.sagemath.org/mirror_list