Merge remote-tracking branch 'upstream/develop' into long-time-extra-marker

Author: user202729

.github/workflows/ci-meson.yml

@@ -142,7 +142,7 @@ jobs:
         # this step must be after build, because meson.build creates a number of __init__.py files
         # that is needed to make tools/update-meson.py run correctly
         shell: bash -l {0}
-        if: matrix.tests == 'all'
+        if: matrix.tests == 'all' && matrix.python == '3.12'
         run: |
           python tools/update-meson.py
           if ! ./tools/test-git-no-uncommitted-changes; then

.github/workflows/ci.yml

@@ -7,6 +7,7 @@ on:
   pull_request:
     paths:
       - '**.build'
+      - 'uv.lock'
       - 'subprojects/**'
       - '.github/workflows/ci.yml'
   workflow_dispatch:

.github/workflows/dist.yml

@@ -78,7 +78,7 @@ jobs:
             upstream
           name: release_dist
 
-  sdists_for_pypi:
+  sdists:
 
     runs-on: ubuntu-latest
     env:
@@ -102,15 +102,6 @@ jobs:
         run: |
           conda install --yes python-build
           python -m build --sdist --no-isolation --outdir dist .
-
-      - name: Old sagemath-standard
-        run: |
-          sudo DEBIAN_FRONTEND=noninteractive apt-get update
-          sudo DEBIAN_FRONTEND=noninteractive apt-get install $(build/bin/sage-get-system-packages debian _bootstrap _prereq)
-          ./bootstrap
-          ./configure
-          make pypi-sdists V=0
-          mv upstream/sage*.tar.gz dist/
           ls -l dist
 
       - uses: actions/upload-artifact@v4
@@ -127,92 +118,37 @@ jobs:
         if: env.CAN_DEPLOY == 'true'
 
   release:
-
-    needs: [release_dist, sdists_for_pypi]
+    needs: [release_dist, sdists]
     runs-on: ubuntu-latest
-    if: (success() || failure()) && github.repository == 'sagemath/sage' && startsWith(github.ref, 'refs/tags/')
+    if: github.ref_type == 'tag'
+    permissions:
+      contents: write
     steps:
       - uses: actions/download-artifact@v4
         with:
           name: release_dist
+
       - uses: actions/download-artifact@v4
         with:
           name: dist
           path: dist
-      - name: Create release
-        env:
-          GITHUB_PAT: ${{ secrets.RELEASE_CREATION_TOKEN }}
-        run: |
-          latest_release_tag=$(curl -s https://api.github.com/repos/${{ github.repository }}/releases \
-          | jq -r 'sort_by(.created_at) | last(.[]).tag_name')
-          release_notes=$(curl -s \
-            -X POST \
-            -H "Accept: application/vnd.github+json" \
-            -H "Authorization: Bearer $GITHUB_PAT" \
-            -H "X-GitHub-Api-Version: 2022-11-28" \
-            https://api.github.com/repos/${{ github.repository }}/releases/generate-notes \
-            -d "{
-              \"tag_name\": \"${{ github.ref_name }}\",
-              \"previous_tag_name\": \"$latest_release_tag\"
-            }" | jq -r '.body')
-          # escape special characters for json
-          release_notes=$(jq -R -s '.' <<< "$release_notes")
-          curl -L \
-            -X POST \
-            -H "Accept: application/vnd.github+json" \
-            -H "Authorization: Bearer $GITHUB_PAT" \
-            -H "X-GitHub-Api-Version: 2022-11-28" \
-            https://api.github.com/repos/${{ github.repository }}/releases \
-            -d "{
-              \"tag_name\": \"${{ github.ref_name }}\",
-              \"prerelease\": ${{ contains(github.ref, 'beta') || contains(github.ref, 'rc') }},
-              \"body\": $release_notes
-            }"
+
       - name: Create release assets
         uses: softprops/action-gh-release@v2
         with:
           files: |
             dist/*
             upstream/*
-          token: ${{ secrets.GITHUB_TOKEN }}
-          tag_name: ${{ github.ref_name }}
-    permissions:
-      contents: write
-
-  noarch_wheels_for_pypi:
-
-    runs-on: ubuntu-latest
-    env:
-      CAN_DEPLOY: ${{ secrets.SAGEMATH_PYPI_API_TOKEN != '' && github.event_name != 'pull_request' }}
-    steps:
-      - uses: actions/checkout@v4
-      - name: Install bootstrap prerequisites
-        run: |
-          sudo DEBIAN_FRONTEND=noninteractive apt-get update
-          sudo DEBIAN_FRONTEND=noninteractive apt-get install $(build/bin/sage-get-system-packages debian _bootstrap _prereq)
-      - name: make pypi-noarch-wheels
-        run: |
-          ./bootstrap
-          ./configure
-          make pypi-noarch-wheels V=0
-          (mkdir dist && mv venv/var/lib/sage/wheels/sage*-none-any.whl dist/)
-          ls -l dist
-      - uses: actions/upload-artifact@v4
-        with:
-          path: "dist/*.whl"
-          name: noarch-wheels
-      - uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          user: __token__
-          password: ${{ secrets.SAGEMATH_PYPI_API_TOKEN }}
-          skip-existing: true
-          verbose: true
-        if: env.CAN_DEPLOY == 'true'
+          token: ${{ secrets.RELEASE_CREATION_TOKEN }}
+          generate_release_notes: true
+          prerelease: ${{ contains(github.ref_name, 'beta') || contains(github.ref_name, 'rc') }}
 
   build_wheels:
+    # Temporarily disabled due to build errors
+    if: false
     name: wheels ${{ matrix.build }}*_${{ matrix.arch }}
     runs-on: ${{ matrix.os }}
-    needs: sdists_for_pypi
+    needs: sdists
     strategy:
       fail-fast: false
       matrix:
@@ -293,10 +229,6 @@ jobs:
               (cd unpacked && tar xfz - ) < $sdist
           done
 
-      - name: sagemath-objects
-        run: |
-          "${{ steps.python.outputs.python-path }}" -m cibuildwheel unpacked/sagemath*objects*
-
       - name: sagemath-bliss
         run: |
           "${{ steps.python.outputs.python-path }}" -m cibuildwheel unpacked/sagemath*bliss*

.github/workflows/doc-build-livedoc.yml

@@ -0,0 +1,87 @@
+name: Build live documentation
+
+on:
+  push:
+    tags:
+      # Match all release tags including beta, rc
+      - '[0-9]+.[0-9]+'
+      - '[0-9]+.[0-9]+.[0-9]+'
+      - '[0-9]+.[0-9]+.beta[0-9]+'
+      - '[0-9]+.[0-9]+.[0-9]+.beta[0-9]+'
+      - '[0-9]+.[0-9]+.rc[0-9]+'
+      - '[0-9]+.[0-9]+.[0-9]+.rc[0-9]+'
+  workflow_dispatch:
+
+env:
+  PYTHON_VERSION: 3.11
+
+jobs:
+  livedoc:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Cache conda packages
+        uses: actions/cache@v4
+        with:
+          path: ~/conda_pkgs_dir
+          key:
+            ${{ runner.os }}-conda-${{ hashFiles('environment-${{ env.PYTHON_VERSION }}-linux.yml') }}
+
+      - name: Compiler cache
+        uses: hendrikmuhs/[email protected]
+        with:
+          key: ${{ runner.os }}-meson-${{ env.PYTHON_VERSION }}
+
+      - name: Setup Conda environment
+        uses: conda-incubator/setup-miniconda@v3
+        with:
+          python-version: ${{ env.PYTHON_VERSION }}
+          # Disabled for now due to
+          # https://github.com/conda-incubator/setup-miniconda/issues/379
+          # miniforge-version: latest
+          use-mamba: true
+          channels: conda-forge
+          channel-priority: true
+          activate-environment: sage-dev
+          environment-file: environment-${{ env.PYTHON_VERSION }}-linux.yml
+
+      - name: Build Sage
+        shell: bash -l {0}
+        run: |
+          export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
+          export CC="ccache $CC"
+          export CXX="ccache $CXX"
+          pip install --no-build-isolation --config-settings=builddir=builddir . -v
+
+      - name: Build pdf doc
+        shell: bash -l {0}
+        run: |
+          sudo DEBIAN_FRONTEND=noninteractive sudo apt-get update
+          sudo DEBIAN_FRONTEND=noninteractive apt-get install $(build/bin/sage-get-system-packages debian texlive texlive_luatex free_fonts xindy)
+          meson compile -C builddir doc-pdf
+
+      - name: Build live doc
+        shell: bash -l {0}
+        run: |
+          meson compile -C builddir doc-html -j1
+        env:
+          SAGE_USE_CDNS: yes
+          SAGE_LIVE_DOC: yes
+          SAGE_JUPYTER_SERVER: "binder:sagemath/sage-binder-env/dev"
+
+      - name: Copy doc
+        id: copy
+        run: |
+          mkdir -p ./doc
+          cp -r builddir/src/doc/pdf doc/
+          cp -rL builddir/src/doc/html doc/
+          cp builddir/src/doc/index.html doc/
+          zip -r livedoc.zip doc
+
+      - name: Upload livedoc
+        uses: actions/upload-artifact@v4
+        with:
+          name: livedoc
+          path: livedoc.zip

.github/workflows/doc-build-pdf.yml

@@ -4,14 +4,6 @@ on:
   pull_request:
   merge_group:
   push:
-    tags:
-      # Match all release tags including beta, rc
-      - '[0-9]+.[0-9]+'
-      - '[0-9]+.[0-9]+.[0-9]+'
-      - '[0-9]+.[0-9]+.beta[0-9]+'
-      - '[0-9]+.[0-9]+.[0-9]+.beta[0-9]+'
-      - '[0-9]+.[0-9]+.rc[0-9]+'
-      - '[0-9]+.[0-9]+.[0-9]+.rc[0-9]+'
     branches:
       - develop
   workflow_dispatch:
@@ -44,7 +36,7 @@ jobs:
           path: ~/conda_pkgs_dir
           key:
             ${{ runner.os }}-conda-${{ hashFiles('environment-${{ env.PYTHON_VERSION }}-linux.yml') }}
-  
+
       - name: Compiler cache
         uses: hendrikmuhs/[email protected]
         with:
@@ -62,7 +54,7 @@ jobs:
           channel-priority: true
           activate-environment: sage-dev
           environment-file: environment-${{ env.PYTHON_VERSION }}-linux.yml
-        
+
       - name: Build Sage
         shell: bash -l {0}
         run: |

.github/workflows/doc-build.yml

@@ -4,14 +4,6 @@ on:
   pull_request:
   merge_group:
   push:
-    tags:
-      # Match all release tags including beta, rc
-      - '[0-9]+.[0-9]+'
-      - '[0-9]+.[0-9]+.[0-9]+'
-      - '[0-9]+.[0-9]+.beta[0-9]+'
-      - '[0-9]+.[0-9]+.[0-9]+.beta[0-9]+'
-      - '[0-9]+.[0-9]+.rc[0-9]+'
-      - '[0-9]+.[0-9]+.[0-9]+.rc[0-9]+'
     branches:
       - develop
   workflow_dispatch:
@@ -74,6 +66,7 @@ jobs:
       #
       # For pull requests
       #
+
       - name: Get workflow run-id
         if: github.event_name == 'pull_request'
         run: |
@@ -113,7 +106,7 @@ jobs:
             mathjax_path_from="[-./A-Za-z_]*/tex-chtml[.]js?v=[0-9a-f]*"
             # mathjax path in new doc
             mathjax_path_to=$(SAGE_USE_CDNS=yes python -c "from src.sage_docbuild.conf import mathjax_path; print(mathjax_path)")
-            new_version=$(cat src/VERSION.txt)
+            new_version=$(cat VERSION.txt)
             # Wipe out chronic diffs between old doc and new doc
             (cd doc && \
              find . -name "*.html" | xargs sed -i -e '/class="sidebar-brand-text"/ s/Sage [0-9a-z.]* /Sage '"$new_version"' /' \
@@ -195,7 +188,7 @@ jobs:
           path: doc.zip
 
       #
-      # On release events
+      # On push events
       #
 
       - name: Upload doc-develop
@@ -205,34 +198,3 @@ jobs:
         with:
           name: doc-${{ github.ref_name }}
           path: doc.zip
-
-      # The following fails randomly
-      # - name: Build live doc
-      #   if: github.event_name != 'pull_request'
-      #   shell: bash -l {0}
-      #   run: |
-      #     # Remove previous doc build
-      #     rm -rf builddir/src/doc
-      #     meson compile -C builddir doc-html
-      #   env:
-      #     SAGE_USE_CDNS: yes
-      #     SAGE_LIVE_DOC: yes
-      #     SAGE_JUPYTER_SERVER: binder:sagemath/sage-binder-env/dev
-      #     SAGE_DOCBUILD_OPTS: "--include-tests-blocks"
-
-      # - name: Copy live doc
-      #   if: github.event_name != 'pull_request'
-      #   run: |
-      #     mkdir -p ./livedoc
-      #     # We copy everything to a local folder
-      #       cp -r builddir/src/doc/html livedoc/
-      #       cp builddir/src/doc/index.html livedoc/
-      #     zip -r livedoc.zip livedoc
-
-      # - name: Upload live doc
-      #   if: github.event_name != 'pull_request'
-      #   uses: actions/upload-artifact@v4
-      #   with:
-      #     name: livedoc
-      #     path: livedoc.zip
-