merge

Author: enriqueartal

.github/workflows/build.yml

@@ -76,190 +76,8 @@ env:
   EXTRA_CONFIGURE_ARGS:   --enable-fat-binary
 
 jobs:
-  test-new:
-    runs-on: ubuntu-latest
-    outputs:
-      build_targets:     ${{ steps.build-targets.outputs.build_targets }}
-    services:
-      # https://docs.docker.com/build/ci/github-actions/local-registry/
-      registry:
-        image: registry:2
-        ports:
-          - 5000:5000
-    steps:
-      - name: Maximize build disk space
-        uses: easimon/maximize-build-space@v10
-        with:
-          # need space in /var for Docker images
-          root-reserve-mb:      30000
-          remove-dotnet:        true
-          remove-android:       true
-          remove-haskell:       true
-          remove-codeql:        true
-          remove-docker-images: true
-
-      - name: Checkout
-        id: checkout
-        uses: actions/checkout@v4
-
-      - name: Get changed files and packages
-        id: changed-files
-        uses: tj-actions/changed-files@v46
-        with:
-          # File extensions for doctests per sage.doctest.control.skipfile
-          # Also src/sage/doctests/tests/ are excluded because of nodoctest file
-          # which would make sage.doctest.control.skipdir return True
-          files_yaml: |
-            configures:
-              - 'build/pkgs/*/spkg-configure.m4'
-            pkgs:
-              - 'build/pkgs/**'
-              - '!build/pkgs/_**'
-              - '!build/pkgs/configure/**'
-              - 'pkgs/**'
-            doctests:
-              - 'src/**/*.{py,pyx,pxd,pxi,sage,spyx,rst,tex}'
-              - '!src/{setup,conftest*}.py'
-              - '!src/sage/doctest/tests/*'
-
-      - name: Determine targets to build
-        id: build-targets
-        run: |
-          uninstall_targets=$(echo $(
-            for a in '' ${{ steps.changed-files.outputs.configures_all_changed_files }}; do
-              # Extract package name from the file path and append '-uninstall'
-              echo $a | sed -E 's,build/pkgs/([a-z0-9][_.a-z0-9]*)/spkg-configure[.]m4 *,\1-uninstall,'
-            done | sort -u  # Sort and ensure uniqueness
-          ))
-          build_targets=$(echo $(
-            for a in '' ${{ steps.changed-files.outputs.pkgs_all_changed_files }}; do
-              # Extract package name, replace '-' with '_', and strip extra parts from the path
-              SPKG=$(echo $a | sed -E 's,-,_,g;s,(build/)?pkgs/([a-z0-9][-_.a-z0-9]*)/[^ ]* *,\2,;')
-              # Check if key files exist in the package directory
-              if [ -f "build/pkgs/$SPKG/checksums.ini" ] || \
-                 [ -f "build/pkgs/$SPKG/requirements.txt" ] || \
-                 [ -f "build/pkgs/$SPKG/spkg-install" ]; then
-                echo "$SPKG-ensure"  # add the "$SPKG-ensure" target
-              fi
-            done | sort -u  # Sort and ensure uniqueness
-          ))
-          if [ -n "$uninstall_targets" ]; then
-            echo "build_targets=$uninstall_targets reconfigure $build_targets ci-build-with-fallback" >> $GITHUB_OUTPUT
-          else
-            echo "build_targets=$build_targets ci-build-with-fallback" >> $GITHUB_OUTPUT
-          fi
-          cat $GITHUB_OUTPUT
-
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.base_ref }}
-          path: worktree-base
-        if: github.base_ref && steps.changed-files.outputs.pkgs_all_changed_files
-
-      - name: Compute metrics
-        run: |
-          export PATH=build/bin:$PATH
-          if [ -d worktree-base ]; then
-            (echo "# $GITHUB_BASE_REF"; SAGE_ROOT=worktree-base sage-package metrics :all:) > base-metrics.txt
-            (echo "# $GITHUB_REF"; sage-package metrics :all:) > metrics.txt
-            diff --color=always --width=100 --side-by-side --left-column base-metrics.txt metrics.txt || true
-          else
-            sage-package metrics :all:
-          fi
-
-      - name: Install test prerequisites
-        # From docker.yml
-        run: |
-          sudo DEBIAN_FRONTEND=noninteractive apt-get update
-          sudo DEBIAN_FRONTEND=noninteractive apt-get install tox
-          sudo apt-get clean
-          df -h
-
-      - name: Merge CI fixes from sagemath/sage
-        # From docker.yml
-        # This step needs to happen after the commit sha is put in DOCKER_TAG
-        # so that multi-stage builds can work correctly.
-        run: |
-          mkdir -p upstream
-          .ci/merge-fixes.sh 2>&1 | tee upstream/ci_fixes.log
-        env:
-          GH_TOKEN: ${{ github.token }}
-          SAGE_CI_FIXES_FROM_REPOSITORIES: ${{ vars.SAGE_CI_FIXES_FROM_REPOSITORIES }}
-
-      # Building
-
-      - name: Generate Dockerfile
-        # From docker.yml
-        run: |
-          tox -e ${{ env.TOX_ENV }}
-          cp .tox/${{ env.TOX_ENV }}/Dockerfile .
-        env:
-          # Only generate the Dockerfile, do not run 'docker build' here
-          DOCKER_TARGETS: ""
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-        with:
-          driver-opts: network=host
-
-      - name: Build Docker image
-        id: image
-        uses: docker/build-push-action@v6
-        with:
-          # push and load may not be set together at the moment
-          #
-          # We are using "push" (to the local registry) because it was
-          # more reliable than "load", for which we observed random failure
-          # conditions in which the built image could not be found.
-          #
-          push:       ${{ steps.changed-files.outputs.doctests_all_changed_files && true || false }}
-          load:       false
-          context:    .
-          tags:       ${{ env.BUILD_IMAGE }}
-          target:     with-targets
-          cache-from: type=gha
-          cache-to:   type=gha,mode=max
-          build-args: |
-            NUMPROC=6
-            USE_MAKEFLAGS=-k V=0 SAGE_NUM_THREADS=4 --output-sync=recurse
-            TARGETS_PRE=build/make/Makefile
-            TARGETS=${{ steps.build-targets.outputs.build_targets }}
-
-      - name: Start container
-        id: container
-        # Try to continue when "exporting to GitHub Actions Cache" failed with timeout
-        if: (success() || failure()) && steps.changed-files.outputs.doctests_all_changed_files
-        run: |
-          docker run --name BUILD -dit \
-                     --mount type=bind,src=$(pwd),dst=$(pwd) \
-                     --workdir $(pwd) \
-                     ${{ env.BUILD_IMAGE }} /bin/sh
-
-      # Testing
-
-      - name: Check that all modules can be imported
-        if: (success() || failure()) && steps.container.outcome == 'success' && steps.changed-files.outputs.doctests_all_changed_files
-        run: |
-          # Increase the length of the lines in the "short summary"
-          export COLUMNS=120
-          # The following command checks that all modules can be imported.
-          # The output also includes a long list of modules together with the number of tests in each module.
-          # This can be ignored.
-          ./sage -python -m pip install pytest-xdist
-          ./sage -python -m pytest -c tox.ini -qq --doctest --collect-only || true
-        shell: sh .ci/docker-exec-script.sh BUILD /sage {0}
-
-      - name: Test changed files
-        if: (success() || failure()) && steps.container.outcome == 'success' && steps.changed-files.outputs.doctests_all_changed_files
-        run: |
-          export MAKE="make -j2 --output-sync=recurse" SAGE_NUM_THREADS=4
-          # https://github.com/tj-actions/changed-files?tab=readme-ov-file#outputs-
-          ./sage -t --long --format github -p4 ${{ steps.changed-files.outputs.doctests_all_changed_files }}
-        shell: sh .ci/docker-exec-script.sh BUILD /sage {0}
-
   test-long:
     runs-on: ubuntu-latest
-    needs: [test-new]
     services:
       # https://docs.docker.com/build/ci/github-actions/local-registry/
       registry:
@@ -334,8 +152,6 @@ jobs:
           context:    .
           tags:       ${{ env.BUILD_IMAGE }}
           target:     with-targets
-          cache-from: type=gha
-          cache-to:   type=gha,mode=max
           build-args: |
             NUMPROC=6
             USE_MAKEFLAGS=-k V=0 SAGE_NUM_THREADS=4 --output-sync=recurse
@@ -454,8 +270,6 @@ jobs:
           context:    .
           tags:       ${{ env.BUILD_IMAGE }}
           target:     with-targets
-          cache-from: type=gha
-          cache-to:   type=gha,mode=max
           build-args: |
             NUMPROC=6
             USE_MAKEFLAGS=-k V=0 SAGE_NUM_THREADS=4 --output-sync=recurse

.github/workflows/ci-meson.yml

@@ -14,23 +14,31 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
+permissions:
+  contents: read
+
 jobs:
   test:
-    name: Conda (${{ matrix.os }}, Python ${{ matrix.python }}${{ matrix.editable && ', editable' || '' }})
+    name: Conda (${{ matrix.os }}, Python ${{ matrix.python }}, ${{ matrix.tests }}${{ matrix.editable && ', editable' || '' }})
     runs-on: ${{ matrix.os }}-latest
 
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu, macos]
+        os: ['ubuntu', 'macos']
         python: ['3.11', '3.12']
+        tests: ['all']
         editable:
           ${{ fromJson(github.event_name == 'pull_request' && '[false]' || '[false, true]') }}
         include:
+          - os: 'ubuntu'
+            python: '3.12'
+            tests: 'new'
           # one additional editable run in pull_request, this has no effect if not pull_request
-          - os: ubuntu
+          - os: 'ubuntu'
             python: 3.12
             editable: true
+            tests: 'all'
 
     steps:
       - uses: actions/checkout@v4
@@ -41,6 +49,17 @@ jobs:
         env:
           GH_TOKEN: ${{ github.token }}
 
+      - name: Mark new files as uncommited
+        if: matrix.tests == 'new' 
+        run: |
+          # List remotes (for debugging)
+          git remote -v
+          # Reset the branch to develop
+          git fetch origin develop
+          git reset --soft origin/develop
+          # Show uncommitted changes
+          git status
+
       - name: Cache conda packages
         uses: actions/cache@v4
         with:
@@ -83,6 +102,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'
         run: |
           python3 tools/update-meson.py
           if ! ./tools/test-git-no-uncommitted-changes; then
@@ -103,7 +123,17 @@ 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 --all -p4 --format github
+          ./sage -t --${{ matrix.tests }} -p4 --format github
+
+      - name: Check that all modules can be imported
+        shell: bash -l {0}
+        run: |
+          # Increase the length of the lines in the "short summary"
+          export COLUMNS=120
+          # The following command checks that all modules can be imported.
+          # The output also includes a long list of modules together with the number of tests in each module.
+          # This can be ignored.
+          pytest -qq --doctest --collect-only || true
 
       - name: Upload log
         uses: actions/[email protected]

.github/workflows/dist.yml

@@ -275,10 +275,6 @@ jobs:
         run: |
           "${{ steps.python.outputs.python-path }}" -m cibuildwheel unpacked/sagemath*objects*
 
-      - name: sagemath-categories
-        run: |
-          "${{ steps.python.outputs.python-path }}" -m cibuildwheel unpacked/sagemath*categories*
-
       - name: sagemath-bliss
         run: |
           "${{ steps.python.outputs.python-path }}" -m cibuildwheel unpacked/sagemath*bliss*

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

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

.vscode/settings.json

@@ -107,7 +107,9 @@
         "zmax",
         "zmin"
     ],
-    "editor.formatOnType": true,
+    "[python]": {
+        "editor.defaultFormatter": "charliermarsh.ruff"
+    },
     "esbonio.sphinx.confDir": "",
     // Don't update the settings.json file with values inferred from Meson (we provide them manually)
     "mesonbuild.modifySettings": false,

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.6.rc1
+version: 10.7.beta0
 doi: 10.5281/zenodo.8042260
-date-released: 2025-03-27
+date-released: 2025-04-02
 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,5 @@
+<<<<<<< HEAD
 SageMath version 10.6.rc1, Release Date: 2025-03-27
+=======
+SageMath version 10.7.beta0, Release Date: 2025-04-02
+>>>>>>> 871ba9daed15374d6b2ff1c533970f44b70f21e9

build/pkgs/configure/checksums.ini

@@ -1,3 +1,3 @@
 tarball=configure-VERSION.tar.gz
-sha1=b864ca0eb94c01c9e724699ac6d797a65b5acbb0
-sha256=5aa6946e6a99eeac2b829f2146338eeef8537a3134b4289078c8417092ecaaf2
+sha1=3371667ee074aefdde8fc64ad60928a29a1e3578
+sha256=4e93801f29ba7d242285ed1461300586b50db56474e84cefe0b793f8dbf54842

build/pkgs/configure/package-version.txt

@@ -1 +1 @@
-8dab37468c9feb4a5a1fcc22bbccc12321aaa475
+a2b47d65bcbe9d176b07208feb6aae513fc41244