Merge remote-tracking branch 'upstream/develop' into union-enumerate-inf

Author: user202729

.ci/write-dockerfile.sh

@@ -284,6 +284,7 @@ $ADD m4 /new/m4
 $ADD pkgs /new/pkgs
 $ADD build /new/build
 $ADD .upstream.d /new/.upstream.d
+$ADD tools /new/tools
 ADD .ci /.ci
 RUN if [ -d /sage ]; then \\
         echo "### Incremental build from \$(cat /sage/VERSION.txt)" && \\

.github/workflows/ci-linux-incremental.yml

@@ -18,6 +18,7 @@ name: CI Linux incremental
 on:
   pull_request:
     paths:
+      - '.github/workflows/ci-linux-incremental.yml'
       - 'build/pkgs/**'
       - '!build/pkgs/sage_conf/**'
       - '!build/pkgs/sage_docbuild/**'
@@ -95,13 +96,11 @@ jobs:
       targets: "${{needs.changed_files.outputs.build_targets}} ci-build-with-fallback doc-html ptest-nodoc"
       tox_system_factors: >-
         ["ubuntu-focal",
-         "ubuntu-noble",
+         "ubuntu-jammy",
          "debian-bullseye",
          "debian-bookworm",
-         "fedora-30",
-         "fedora-40",]
+         "fedora-41",]
       tox_packages_factors: >-
-          ["standard",
-           "minimal"]
+          ["standard"]
       docker_push_repository: ghcr.io/${{ github.repository }}/
       max_parallel: 8

.github/workflows/ci-macos.yml

@@ -18,6 +18,10 @@ name: CI macOS
 #on: [push, pull_request]
 
 on:
+  pull_request:
+    paths:
+      - '.github/workflows/ci-macos.yml'
+      - '.github/workflows/macos.yml'
   push:
     tags:
       - '*'
@@ -60,7 +64,7 @@ jobs:
   stage-2-experimental-0-o:
     uses: ./.github/workflows/macos.yml
     with:
-      stage: "2-optional-0-o"
+      stage: "2-experimental-0-o"
     needs: [stage-2-optional-p-z]
     if: ${{ success() || failure() }}
 

.github/workflows/docker.yml

@@ -18,7 +18,6 @@ on:
         # 'tox -e update_docker_platforms' updates below
         default: >-
           [
-           "ubuntu-xenial-toolchain-gcc_9",
            "ubuntu-focal",
            "ubuntu-jammy",
            "debian-bullseye",

.github/workflows/macos.yml

@@ -66,7 +66,7 @@ jobs:
     env:
       TOX_ENV: local-${{ matrix.osversion_xcodeversion_toxenv[2] }}${{ matrix.osversion_xcodeversion_toxenv[1] && format('-{0}', matrix.osversion_xcodeversion_toxenv[1]) }}
       LOCAL_ARTIFACT_NAME: sage-local-commit-${{ github.sha }}-tox-local-${{ matrix.osversion_xcodeversion_toxenv[2] }}-macos-${{ matrix.osversion_xcodeversion_toxenv[0] }}${{ matrix.osversion_xcodeversion_toxenv[1] && format('-{0}', matrix.osversion_xcodeversion_toxenv[1]) }}
-      LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-local-${{ matrix.osversion_xcodeversion_toxenv[2] }}-macos-${{ matrix.osversion_xcodeversion_toxenv[0] }}${{ matrix.osversion_xcodeversion_toxenv[1] && format('-{0}', matrix.osversion_xcodeversion_toxenv[1]) }}
+      LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-local-${{ matrix.osversion_xcodeversion_toxenv[2] }}-macos-${{ matrix.osversion_xcodeversion_toxenv[0] }}${{ matrix.osversion_xcodeversion_toxenv[1] && format('-{0}', matrix.osversion_xcodeversion_toxenv[1]) }}-stage${{ inputs.stage }}
     steps:
       - name: Check out SageMath
         uses: actions/checkout@v4
@@ -163,4 +163,4 @@ jobs:
         with:
           path: sage-local-artifact/sage-${{ env.TOX_ENV }}-${{ inputs.stage }}.tar
           name: ${{ env.LOCAL_ARTIFACT_NAME }}
-        if: always()
+        if: contains(inputs.stage, '1')

.upstream.d/20-github.com-sagemath-sage-releases

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

CITATION.cff

@@ -4,8 +4,8 @@ title: SageMath
 abstract: SageMath is a free open-source mathematics software system.
 authors:
 - name: "The SageMath Developers"
-version: 10.7.beta1
+version: 10.7.beta2
 doi: 10.5281/zenodo.8042260
-date-released: 2025-04-18
+date-released: 2025-04-29
 repository-code: "https://github.com/sagemath/sage"
 url: "https://www.sagemath.org/"

Pipfile

@@ -0,0 +1,40 @@
+## Pipfile with all packages in the Sage distribution and version information locked
+## FIXME: Many packages still missing.
+[[source]]
+name = "pypi"
+url = "https://pypi.org/simple"
+verify_ssl = true
+
+[dev-packages]
+pkgconfig = "==1.5.5"
+cython = "==3.0.11"
+pycodestyle = "*"
+ipykernel = "==6.27.1"
+tox = "*"
+jinja2 = "==3.1.4"
+pytest = "*"
+ipywidgets = "==8.1.1"
+sphinx = "==7.4.7"
+rope = "*"
+six = "*"
+jupyter-core = "==5.3.2"
+
+[packages]
+numpy = "==1.26.3"
+cysignals = "==1.11.4"
+cypari2 = "==2.2.0"
+gmpy2 = "==2.2.0a1"
+pexpect = "==4.9.0"
+ipython = "==8.18.1"
+sympy = "==1.13.2"
+scipy = "==1.12.0"
+pplpy = "==0.8.9"
+matplotlib = "==3.8.0"
+cvxopt = "==1.3.2"
+rpy2 = "==3.4.5"
+networkx = "==3.2.1"
+
+sagemath-standard = { path = "src" }
+
+[requires]
+python_version = "3.9"

VERSION.txt

@@ -1 +1 @@
-SageMath version 10.7.beta1, Release Date: 2025-04-18
+SageMath version 10.7.beta2, Release Date: 2025-04-29

build/pkgs/configure/checksums.ini

@@ -1,3 +1,3 @@
 tarball=configure-VERSION.tar.gz
-sha1=db1650ff7b9bb3d07adbf2c6c1d4be2e39c22920
-sha256=7998f8b4ce7b527248461f87b305752f18d07460792d157447bd31b45b0dbc3d
+sha1=ccd2ea260f6193ef117e33345b48cb5ba773144a
+sha256=d40b2445b4973363e7f614a279fbdadeb7c977900091d2b6b619238c5073cdcf