Merge remote-tracking branch 'upstream/develop' into meson-arch

Author: tobiasdiez

.github/workflows/ci-macos.yml

@@ -21,56 +21,51 @@ on:
   pull_request:
     paths:
       - '.github/workflows/ci-macos.yml'
-      - '.github/workflows/macos.yml'
   push:
     tags:
       - '*'
   workflow_dispatch:
     # Allow to run manually
 
-env:
-  TARGETS_PRE: all-sage-local
-  TARGETS: build
-  TARGETS_OPTIONAL: ptest
-
 jobs:
-  stage-1:
-    uses: ./.github/workflows/macos.yml
-    with:
-      stage: "1"
-      timeout: 14400
-
-  stage-2:
-    uses: ./.github/workflows/macos.yml
-    with:
-      stage: "2"
-    needs: [stage-1]
-    if: ${{ success() || failure() }}
+  macos:
+    name: Build and Test (macos-${{ matrix.version }})
+    runs-on: macos-${{ matrix.version }}
+    strategy:
+      fail-fast: false
+      matrix:
+        version:
+          - '13'
+          - '14'
+          - '15'
 
-  stage-2-optional-0-o:
-    uses: ./.github/workflows/macos.yml
-    with:
-      stage: "2-optional-0-o"
-    needs: [stage-2]
-    if: ${{ success() || failure() }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
 
-  stage-2-optional-p-z:
-    uses: ./.github/workflows/macos.yml
-    with:
-      stage: "2-optional-p-z"
-    needs: [stage-2-optional-0-o]
-    if: ${{ success() || failure() }}
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.13"
+        
+      - name: Install test prerequisites
+        run: python -m pip install tox
 
-  stage-2-experimental-0-o:
-    uses: ./.github/workflows/macos.yml
-    with:
-      stage: "2-experimental-0-o"
-    needs: [stage-2-optional-p-z]
-    if: ${{ success() || failure() }}
+      - name: Install dependencies
+        run: |
+          eval $(build/bin/sage-print-system-package-command homebrew update)
+          eval $(build/bin/sage-print-system-package-command homebrew --yes --ignore-missing install $(build/bin/sage-get-system-packages homebrew _bootstrap _prereq $(build/bin/sage-package list :standard:)))
 
-  stage-2-experimental-p-z:
-    uses: ./.github/workflows/macos.yml
-    with:
-      stage: "2-experimental-p-z"
-    needs: [stage-2-experimental-0-o]
-    if: ${{ success() || failure() }}
+      - name: Build
+        run: |
+          source ./.homebrew-build-env
+          ./bootstrap
+          ./configure --enable-download-from-upstream-url
+          make build V=0
+        env:
+          MAKE: 'make -j6'
+      
+      - name: Test
+        run: |
+          source ./.homebrew-build-env # Needed so that runtime cython can find the dependencies
+          ./sage -t --all -p4
+    

.github/workflows/ci.yml

@@ -105,10 +105,10 @@ jobs:
         id: clear-container-name
         if: failure() || success()
         run: |
-          # Output the container name, but with ":" replaced by "-"
-          # This is needed to avoid issues with the upload-artifact action
-          CONTAINER_NAME=$(echo "${{ matrix.container }}" | tr ':' '-')
-          echo "CONTAINER_NAME=$CONTAINER_NAME" >> $GITHUB_OUTPUT
+            # Output the container name, but with ":" and "/" replaced by "-"
+            # This is needed to avoid issues with the upload-artifact action
+            CONTAINER_NAME=$(echo "${{ matrix.container }}" | tr ':/' '--')
+            echo "CONTAINER_NAME=$CONTAINER_NAME" >> $GITHUB_OUTPUT
 
       - name: Upload log
         uses: actions/[email protected]

.github/workflows/macos.yml

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

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

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

CITATION.cff

@@ -1 +1 @@
-SageMath version 10.7.rc0, Release Date: 2025-08-02
+SageMath version 10.8.beta0, Release Date: 2025-08-16

VERSION.txt

@@ -1,4 +1,4 @@
 tarball=beniget-VERSION.tar.gz
-sha1=0167f16d17fbd61b91e620bca07e4ec7054ce51d
-sha256=75554b3b8ad0553ce2f607627dad3d95c60c441189875b98e097528f8e23ac0c
+sha1=95233c191f0ea8486a8ef0cf40d9c5a9838f2439
+sha256=a0258537e65e7e14ec33a86802f865a667f949bb6c73646d55e42f7c45a052ae
 upstream_url=https://files.pythonhosted.org/packages/source/b/beniget/beniget-VERSION.tar.gz

build/pkgs/beniget/checksums.ini

@@ -1 +1 @@
-0.4.1
+0.4.2.post1

build/pkgs/beniget/package-version.txt

@@ -1,4 +1,4 @@
 tarball=cliquer-VERSION.tar.gz
-sha1=2973abfcf84f9d098e8abbf4f0ac4b776c7f6105
-sha256=6ff79e1e9983ebabbca3dd276a8a310cbdeb48c7adf95f37abd83129b566340e
+sha1=10ffd7cc1a280e6a70dee510ccf5020d4d8c5877
+sha256=c1d7cc927b7efe76ff4f11e1f01bee473e37360fb54843b16b287e3ad161287b
 upstream_url=https://github.com/dimpase/autocliquer/releases/download/vVERSION/cliquer-VERSION.tar.gz

build/pkgs/cliquer/checksums.ini

@@ -1 +1 @@
-1.22
+1.23