Merge remote-tracking branch 'origin/develop' into develop

Author: fisheryv

.github/workflows/ci-meson.yml

@@ -25,7 +25,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: ['ubuntu', 'macos']
+        os: ['ubuntu', 'macos', 'windows']
         python: ['3.11', '3.12']
         tests: ['all']
         editable:
@@ -39,6 +39,9 @@ jobs:
             python: 3.12
             editable: true
             tests: 'all'
+          - os: windows
+            python: '3.13'
+            tests: 'all'
 
     steps:
       - uses: actions/checkout@v4
@@ -66,6 +69,17 @@ jobs:
           path: ~/conda_pkgs_dir
           key:
             ${{ runner.os }}-conda-${{ hashFiles('environment-3.11-linux.yml') }}
+      
+      - name: Setup MSVC environment
+        if: runner.os == 'windows'
+        uses: ilammy/msvc-dev-cmd@v1
+
+      - name: Remove Git link.exe
+        if: runner.os == 'windows'
+        # It conflicts with the vs linker 
+        # So we delete it, following the advice on https://github.com/ilammy/msvc-dev-cmd?tab=readme-ov-file#name-conflicts-with-shell-bash 
+        run: rm -f "C:/Program Files/Git/usr/bin/link.exe"
+        shell: bash
 
       - name: Compiler cache
         uses: hendrikmuhs/[email protected]
@@ -76,12 +90,14 @@ jobs:
         uses: conda-incubator/setup-miniconda@v3
         with:
           python-version: ${{ matrix.python }}
-          miniforge-version: latest
+          # 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-${{ matrix.python }}-${{ startsWith(matrix.os, 'macos') && (startsWith(runner.arch, 'ARM') && 'macos' || 'macos-x86_64') || 'linux' }}.yml
+          environment-file: environment-${{ matrix.python }}-${{ startsWith(matrix.os, 'macos') && (startsWith(runner.arch, 'ARM') && 'macos' || 'macos-x86_64') || startsWith(matrix.os, 'ubuntu') && 'linux' || 'win' }}.yml
 
       - name: Print Conda environment
         shell: bash -l {0}
@@ -92,9 +108,15 @@ jobs:
       - name: Build
         shell: bash -l {0}
         run: |
-          export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-          export CC="ccache $CC"
-          export CXX="ccache $CXX"
+          if [[ "$RUNNER_OS" != "Windows" ]]; then
+            export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
+            export CC="ccache $CC"
+            export CXX="ccache $CXX"
+          else
+            export LIB="$LIB;$CONDA_PREFIX\\Library\\lib"
+            export INCLUDE="$INCLUDE;$CONDA_PREFIX\\Library\\include"
+          fi
+
           # 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=builddir=builddir ${{ matrix.editable && '--editable' || '' }} . -v
 
@@ -104,7 +126,7 @@ jobs:
         shell: bash -l {0}
         if: matrix.tests == 'all'
         run: |
-          python3 tools/update-meson.py
+          python tools/update-meson.py
           if ! ./tools/test-git-no-uncommitted-changes; then
             git add --intent-to-add .  # also show newly created files in git diff
             git status
@@ -123,7 +145,12 @@ jobs:
           # If editable then deleting the directory will cause sage to detect rebuild, which will cause ninja to fail
           # so we don't delete the directory in this case
           ${{ matrix.editable && 'true' || 'rm -R ./src/sage_setup/' }}
-          ./sage -t ${{ matrix.tests == 'all' && '--all' || '--new --long' }} -p4 --format github
+          if [[ "$RUNNER_OS" == "Windows" ]]; then
+            # Ignore errors on Windows, for now
+            pytest --doctest-ignore-import-errors --doctest -rfEs -s src || true
+          else
+            ./sage -t ${{ matrix.tests == 'all' && '--all' || '--new --long' }} -p4 --format github
+          fi
 
       - name: Check that all modules can be imported
         shell: bash -l {0}

.github/workflows/dist.yml

@@ -10,7 +10,9 @@ on:
       - '[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]+'
-
+  pull_request:
+    paths:
+      - '.github/workflows/dist.yml'
   workflow_dispatch:
     # Allow to run manually
 
@@ -80,24 +82,42 @@ jobs:
 
     runs-on: ubuntu-latest
     env:
-      CAN_DEPLOY: ${{ secrets.SAGEMATH_PYPI_API_TOKEN != '' }}
+      CAN_DEPLOY: ${{ secrets.SAGEMATH_PYPI_API_TOKEN != '' && github.event_name != 'pull_request' }}
     steps:
       - uses: actions/checkout@v4
-      - name: Install bootstrap prerequisites
+    
+      - name: Setup Conda environment
+        uses: conda-incubator/setup-miniconda@v3
+        with:
+          python-version: 3.12
+          miniforge-version: latest
+          use-mamba: true
+          channels: conda-forge
+          channel-priority: true
+          activate-environment: sage-dev
+          environment-file: environment-3.12-linux.yml
+
+      - name: Create source distribution
+        shell: bash -l {0}
+        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)
-      - name: make pypi-sdists
-        run: |
           ./bootstrap
           ./configure
           make pypi-sdists V=0
-          (mkdir dist && mv upstream/sage*.tar.gz dist/)
+          mv upstream/sage*.tar.gz dist/
           ls -l dist
+
       - uses: actions/upload-artifact@v4
         with:
           path: "dist/*.tar.gz"
           name: dist
+
       - uses: pypa/gh-action-pypi-publish@release/v1
         with:
           user: __token__
@@ -161,7 +181,7 @@ jobs:
 
     runs-on: ubuntu-latest
     env:
-      CAN_DEPLOY: ${{ secrets.SAGEMATH_PYPI_API_TOKEN != '' }}
+      CAN_DEPLOY: ${{ secrets.SAGEMATH_PYPI_API_TOKEN != '' && github.event_name != 'pull_request' }}
     steps:
       - uses: actions/checkout@v4
       - name: Install bootstrap prerequisites
@@ -304,7 +324,7 @@ jobs:
     needs: build_wheels
     runs-on: ubuntu-latest
     env:
-      CAN_DEPLOY: ${{ secrets.SAGEMATH_PYPI_API_TOKEN != '' }}
+      CAN_DEPLOY: ${{ secrets.SAGEMATH_PYPI_API_TOKEN != '' && github.event_name != 'pull_request' }}
     steps:
 
       - uses: actions/download-artifact@v4

.gitignore

@@ -305,6 +305,11 @@ builddir-*
 build-install
 build/cp*
 
+# Meson subprojects
+/subprojects/*
+!/subprojects/*.wrap
+!/subprojects/packagefiles
+
 # Meson temporary files
 subprojects/wrapdb.json
 src/sage/interfaces/__init__.py

.vscode/settings.json

@@ -2,7 +2,6 @@
     // This settings file is not ignored by git.
     "files.exclude": {
         "**/__pycache__": true,
-        "src/**/*.cpp": true,
         "src/**/*.so": true
     },
     "search.exclude": {

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

VERSION.txt

@@ -1 +1 @@
-SageMath version 10.7.beta3, Release Date: 2025-05-11
+SageMath version 10.7.beta4, Release Date: 2025-05-18

build/pkgs/configure/checksums.ini

@@ -1,3 +1,3 @@
 tarball=configure-VERSION.tar.gz
-sha1=343cae814ac674ace81de9f0af5eca6347fee347
-sha256=622cbdc34c528eb4594c553a2b8e9957d8d93fc3e439e91243985b24095217ec
+sha1=2b82d3f61ce5242564303693ec5cf868bed70e67
+sha256=307a4306540a791edb795baad821ebc708a589960146c4a20d3d14aa730fc1ea

build/pkgs/configure/package-version.txt

@@ -1 +1 @@
-19e94c2106f252c28c17b55f6a8db1a19b45e00b
+731c1bad33aa2dc17ded3fb92e76203331ecd3f5

build/pkgs/cypari/checksums.ini

@@ -1,4 +1,4 @@
 tarball=cypari2-VERSION.tar.gz
-sha1=556d1a16818663ba6e6a3c9d2b14cc907a7eef4c
-sha256=aaa017a6a280581902f73cf5ce1695712b6598a032be14cfab81f97c475f83b8
+sha1=5d91408a6e28e43d429667554d2696cfbd58c35b
+sha256=13a338735ea221c1068f8fc415561bf777d8c68725702bc749547264fd091720
 upstream_url=https://files.pythonhosted.org/packages/source/c/cypari2/cypari2-VERSION.tar.gz

build/pkgs/cypari/package-version.txt

@@ -1 +1 @@
-2.2.1
+2.2.2