Merge remote-tracking branch 'upstream/develop' into gap-4.13.0

sagemath · Jul 18, 2024 · ce8e4d4 · ce8e4d4
2 parents fe5c6cb + 820502f
commit ce8e4d4
Show file tree

Hide file tree

Showing 629 changed files with 17,428 additions and 16,284 deletions.
diff --git a/.ci/create-changes-html.sh b/.ci/create-changes-html.sh
@@ -8,8 +8,6 @@ fi
 BASE_DOC_COMMIT="$1"
 DOC_REPOSITORY="$2"
 
-# Wipe out chronic diffs between old doc and new doc
-(cd $DOC_REPOSITORY && find . -name "*.html" | xargs sed -i -e '\;<script type="application/vnd\.jupyter\.widget-state+json">;,\;</script>; d')
 # Create CHANGES.html
 echo '<html>' > CHANGES.html
 echo '<head>' >> CHANGES.html
@@ -19,7 +17,9 @@ echo '<script>hljs.highlightAll();</script>' >> CHANGES.html
 cat >> CHANGES.html << EOF
 <script>
 document.addEventListener('DOMContentLoaded', () => {
-const baseDocURL = 'https://sagemath.netlify.app'
+// This URL is hardcoded in the file .github/workflows/doc-publish.yml.
+// See NETLIFY_ALIAS of the "Deploy to Netlify" step.
+const baseDocURL = 'https://doc-develop--sagemath.netlify.app'
 const diffSite = 'https://pianomister.github.io/diffsite'
 const diffParagraphs = document.querySelectorAll('p.diff');
 diffParagraphs.forEach(paragraph => {

diff --git a/.devcontainer/portability-centos-stream-8-python3.9-minimal/devcontainer.json b/.devcontainer/portability-centos-stream-8-python3.9-minimal/devcontainer.json
diff --git a/.devcontainer/portability-centos-stream-8-python3.9-minimal/portability-Dockerfile b/.devcontainer/portability-centos-stream-8-python3.9-minimal/portability-Dockerfile
diff --git a/.devcontainer/portability-centos-stream-8-python3.9-standard/devcontainer.json b/.devcontainer/portability-centos-stream-8-python3.9-standard/devcontainer.json
diff --git a/.devcontainer/portability-centos-stream-8-python3.9-standard/portability-Dockerfile b/.devcontainer/portability-centos-stream-8-python3.9-standard/portability-Dockerfile
diff --git a/.github/workflows/ci-conda-known-test-failures.json b/.github/workflows/ci-conda-known-test-failures.json
@@ -53,6 +53,12 @@
     "sage.rings.function_field.drinfeld_modules.morphism": {
         "failed": "unreported random failure seen in https://github.com/sagemath/sage/actions/runs/6840502530/job/18599835766#step:11:10107"
     },
+    "sage.rings.number_field.galois_group": {
+        "failed": "unreported failure on macOS (sort order) in GaloisGroup_v2.artin_symbol, https://github.com/sagemath/sage/actions/runs/9525536510/job/26259809272?pr=37998"
+    },
+    "sage.rings.number_field.number_field": {
+        "failed": "unreported failure on macOS (sort order) in NumberField_absolute.[optimized_]subfields, https://github.com/sagemath/sage/actions/runs/9525536510/job/26259809272?pr=37998"
+    },
     "sage.rings.polynomial.multi_polynomial_ideal": {
         "failed": true
     },
@@ -65,6 +71,9 @@
     "sage.rings.polynomial.skew_polynomial_finite_field": {
         "failed": true
     },
+    "sage.rings.qqbar": {
+        "failed": "unreported failure on macOS seen in https://github.com/sagemath/sage/actions/runs/9525536510/job/26259809272?pr=37998"
+    },
     "sage.schemes.elliptic_curves.descent_two_isogeny": {
         "failed": "random segfault (macOS) https://github.com/sagemath/sage/issues/36949"
     },

diff --git a/.github/workflows/ci-conda.yml b/.github/workflows/ci-conda.yml
@@ -18,15 +18,16 @@ concurrency:
 jobs:
   test:
     name: Conda
-    runs-on: ${{ matrix.os }}-latest
+    runs-on: ${{ matrix.os }}
 
     strategy:
+      fail-fast: false
       matrix:
         # On pushes to tags or branches, test the whole matrix.
         os: >-
           ${{ github.event_name == 'pull_request'
-                && fromJson('["ubuntu"]')
-                || fromJson('["ubuntu", "macos"]') }}
+                && fromJson('["ubuntu-latest"]')
+                || fromJson('["ubuntu-latest", "macos-latest", "macos-13"]') }}
         python: >-
           ${{ github.event_name == 'pull_request'
                 && fromJson('["3.9"]')
@@ -35,12 +36,12 @@ jobs:
         # environment: [environment, environment-optional]
         conda-env: [environment]
         # On pull requests, only test two jobs:
-        # Ubuntu with Python 3.9, macOS with Python 3.11.
+        # Ubuntu with Python 3.9, macOS (arm64) with Python 3.11.
         # Build & Test currently uses Python 3.10 (on ubuntu-jammy).
         # Together, they cover the supported minor Python versions.
         include: >-
           ${{ github.event_name == 'pull_request'
-                && fromJson('[{"os": "macos", "python": "3.11", "conda-env": "environment"}]')
+                && fromJson('[{"os": "macos-latest", "python": "3.11", "conda-env": "environment"}]')
                 || fromJson('[]') }}
 
     steps:
@@ -69,7 +70,7 @@ jobs:
           channels: conda-forge
           channel-priority: true
           activate-environment: sage
-          environment-file: src/${{ matrix.conda-env }}-${{ matrix.python }}-${{ startsWith(matrix.os, 'macos') && 'macos' || 'linux' }}.yml
+          environment-file: src/${{ matrix.conda-env }}-${{ matrix.python }}-${{ startsWith(matrix.os, 'macos') && (startsWith(runner.arch, 'ARM') && 'macos' || 'macos-x86_64') || 'linux' }}.yml
 
       - name: Print Conda environment
         shell: bash -l {0}
@@ -89,8 +90,8 @@ jobs:
           # Use --no-deps and pip check below to verify that all necessary dependencies are installed via conda.
           pip install --no-build-isolation --no-deps --config-settings editable_mode=compat -v -v -e ./src
         env:
-          SAGE_NUM_THREADS: 2
-        
+          SAGE_NUM_THREADS: 5
+
       - name: Verify dependencies
         if: success() || failure()
         shell: bash -l {0}

diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml
@@ -118,7 +118,6 @@ jobs:
          "linuxmint-21.2",
          "fedora-38",
          "fedora-39",
-         "centos-stream-8-python3.9",
          "centos-stream-9-python3.9",
          "almalinux-8-python3.9",
          "gentoo-python3.10",

diff --git a/.github/workflows/conda-lock-update.py b/.github/workflows/conda-lock-update.py
@@ -11,8 +11,8 @@
 platforms = {
     "linux-64": "linux",
     "linux-aarch64": "linux-aarch64",
-    "osx-64": "macos",
-    "osx-arm64": "macos-arm64"
+    "osx-64": "macos-x86_64",
+    "osx-arm64": "macos"
     #"win-64": "win",
 }
 pythons = ["3.9", "3.10", "3.11"]

diff --git a/.github/workflows/doc-build-pdf.yml b/.github/workflows/doc-build-pdf.yml
@@ -30,7 +30,7 @@ env:
   EXTRA_CONFIGURE_ARGS:   --enable-fat-binary
 
 jobs:
-  build-docs-pdf:
+  build-doc-pdf:
     runs-on: ubuntu-latest
     services:
       # https://docs.docker.com/build/ci/github-actions/local-registry/
@@ -110,7 +110,9 @@ jobs:
                      --workdir $(pwd) \
                      ${{ env.BUILD_IMAGE }} /bin/sh
 
-      # Docs
+      #
+      # On PRs and pushes to branches
+      #
 
       - name: Update system packages
         id: packages
@@ -122,29 +124,27 @@ jobs:
           eval $(sage-print-system-package-command auto --spkg --yes --no-install-recommends install git texlive texlive_luatex free_fonts xindy)
         shell: sh .ci/docker-exec-script.sh BUILD /sage {0}
 
-      - name: Build docs (PDF)
+      - name: Build doc (PDF)
         id: docbuild
         if: (success() || failure()) && steps.packages.outcome == 'success'
         run: |
           export MAKE="make -j5 --output-sync=recurse" SAGE_NUM_THREADS=5
           make doc-clean doc-uninstall; make sagemath_doc_html-build-deps sagemath_doc_pdf-no-deps
         shell: sh .ci/docker-exec-script.sh BUILD /sage {0}
 
-      - name: Copy docs
+      - name: Copy doc
         id: copy
         if: (success() || failure()) && steps.docbuild.outcome == 'success'
         run: |
-          # For some reason the deploy step below cannot find /sage/...
-          # So copy everything from there to local folder
-          mkdir -p ./docs
-          cp -r -L /sage/local/share/doc/sage/pdf ./docs
+          mkdir -p ./doc
+          # We copy everything to a local folder
+          docker cp BUILD:/sage/local/share/doc/sage/pdf doc
           # Zip everything for increased performance
-          zip -r docs-pdf.zip docs
-        shell: sh .ci/docker-exec-script.sh BUILD /sage {0}
+          zip -r doc-pdf.zip doc
 
-      - name: Upload docs
+      - name: Upload doc
         if: (success() || failure()) && steps.copy.outcome == 'success'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: docs-pdf
-          path: docs-pdf.zip
+          name: doc-pdf
+          path: doc-pdf.zip