Merge branch 'develop' of https://github.com/fisheryv/sage into develop

Author: fisheryv

.devcontainer/onCreate-conda.sh

@@ -6,8 +6,8 @@ conda config --env --add channels conda-forge
 conda config --env --set channel_priority strict
 conda update -y --all --override-channels -c conda-forge
 conda install mamba=1 -n base -y
-mamba env create -y --file environment-3.11-linux.yml || mamba env update -y --file environment-3.11-linux.yml
+mamba env create -y --file environment-3.11-linux.yml || mamba env update --file environment-3.11-linux.yml
 conda init bash
 
 # Build sage
-conda run -n sage-dev pip install --no-build-isolation -v -v -e .
+conda run -n sage-dev pip install --no-build-isolation -v -v -e . --config-settings=build-dir="build/conda-cp311"

.devcontainer/onCreate-meson.sh

@@ -20,10 +20,11 @@ uv venv
 uv pip install \
     meson-python \
     "cypari2 >=2.2.1" \
-    "cysignals >=1.11.2, != 1.12.0" \
+    "cython >=3.0, != 3.0.3, != 3.1.0" \
     "cython >=3.0, != 3.0.3" \
     "gmpy2 ~=2.1.b999" \
     memory_allocator \
     "numpy >=1.25" \
-    jinja2
-uv sync --frozen --inexact --no-build-isolation-package=sagemath
+    jinja2 \
+    setuptool
+uv sync --frozen --inexact --no-build-isolation

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

@@ -20,6 +20,7 @@ on:
     paths:
       - '.github/workflows/ci-linux-incremental.yml'
       - 'build/pkgs/**'
+      - 'configure.ac'
       - '!build/pkgs/sage_conf/**'
       - '!build/pkgs/sage_docbuild/**'
       - '!build/pkgs/sage_setup/**'

.github/workflows/ci-meson.yml

@@ -88,6 +88,8 @@ jobs:
 
       - name: Setup Conda environment
         uses: conda-incubator/setup-miniconda@v3
+        continue-on-error: true
+        id: conda1
         with:
           python-version: ${{ matrix.python }}
           # Disabled for now due to
@@ -99,6 +101,22 @@ jobs:
           activate-environment: sage-dev
           environment-file: environment-${{ matrix.python }}-${{ startsWith(matrix.os, 'macos') && (startsWith(runner.arch, 'ARM') && 'macos' || 'macos-x86_64') || startsWith(matrix.os, 'ubuntu') && 'linux' || 'win' }}.yml
 
+      # Sometimes the conda setup fails due to network issues.
+      # This is a workaround to retry the setup step if it fails.
+      # Workaround for https://github.com/conda-incubator/setup-miniconda/issues/129
+      - name: Setup Conda environment (2nd time)
+        uses: conda-incubator/setup-miniconda@v3
+        if: steps.conda1.outcome == 'failure'
+        with:
+          python-version: ${{ matrix.python }}
+          miniforge-version: latest
+          use-mamba: true
+          channels: conda-forge
+          channel-priority: true
+          activate-environment: sage-dev
+          environment-file: environment-${{ matrix.python }}-${{ startsWith(matrix.os, 'macos') && (startsWith(runner.arch, 'ARM') && 'macos' || 'macos-x86_64') || 'linux' }}.yml
+
+
       - name: Print Conda environment
         shell: bash -l {0}
         run: |

.github/workflows/ci.yml

@@ -30,7 +30,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v6.0.1
+        uses: astral-sh/setup-uv@v6.1.0
 
       # We cannot use the setup python action because it doesn't support all containers
       # https://github.com/actions/setup-python/issues/527
@@ -62,16 +62,16 @@ jobs:
         run: |
           # Install build dependencies manually as workaround for https://github.com/astral-sh/uv/issues/1516
           uv pip install \
-            meson-python \
-            "cypari2 >=2.2.1" \
-            "cysignals >=1.11.2, != 1.12.0" \
-            "cython >=3.0, != 3.0.3" \
-            "gmpy2 ~=2.1.b999" \
-            memory_allocator \
-            "numpy >=1.25" \
-            jinja2
-
-          uv sync --frozen --inexact --no-build-isolation-package=sagemath
+              meson-python \
+              "cypari2 >=2.2.1" \
+              "cython >=3.0, != 3.0.3, != 3.1.0" \
+              "cython >=3.0, != 3.0.3" \
+              "gmpy2 ~=2.1.b999" \
+              memory_allocator \
+              "numpy >=1.25" \
+              jinja2 \
+              setuptool
+          uv sync --frozen --inexact --no-build-isolation
 
       - name: Test
         run: |

.github/workflows/docker.yml

@@ -20,6 +20,7 @@ on:
           [
            "ubuntu-focal",
            "ubuntu-jammy",
+           "ubuntu-noble",
            "debian-bullseye",
            "debian-bookworm",
            "fedora-40",

.vscode/settings.json

@@ -70,6 +70,8 @@
         "mathrm",
         "Michal",
         "micjung",
+        "Miniconda",
+        "Miniforge",
         "Minkowski",
         "Möbius",
         "mpfr",
@@ -79,12 +81,15 @@
         "pari",
         "prandom",
         "Pynac",
+        "pyproject",
         "rightarrow",
         "sagemath",
         "scalarfield",
+        "sdist",
         "SEEALSO",
         "setminus",
         "smithform",
+        "spkg",
         "subchart",
         "subcharts",
         "subframe",

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.beta4
+version: 10.7.beta5
 doi: 10.5281/zenodo.8042260
-date-released: 2025-05-18
+date-released: 2025-06-01
 repository-code: "https://github.com/sagemath/sage"
 url: "https://www.sagemath.org/"

VERSION.txt

@@ -1 +1 @@
-SageMath version 10.7.beta4, Release Date: 2025-05-18
+SageMath version 10.7.beta5, Release Date: 2025-06-01

build/pkgs/configure/checksums.ini

@@ -1,3 +1,3 @@
 tarball=configure-VERSION.tar.gz
-sha1=2b82d3f61ce5242564303693ec5cf868bed70e67
-sha256=307a4306540a791edb795baad821ebc708a589960146c4a20d3d14aa730fc1ea
+sha1=71e76e4d1c6e4c3c6f225a6dbcee0055bca54192
+sha256=ba4fb20c79af60e61ca4656cbddb6dfb5d3cee545e751dbb9e49243d345db6db