Merge branch 'sagemath:develop' into submatrices

Author: marizee

.github/workflows/build.yml

@@ -103,12 +103,24 @@ jobs:
         run: pyright
         working-directory: ./worktree-image
 
-      - name: Build (fallback to non-incremental)
-        id: build
+      - name: Clean (fallback to non-incremental)
+        id: clean
         if: always() && steps.worktree.outcome == 'success' && steps.incremental.outcome != 'success'
         run: |
           set -ex
-          ./bootstrap && make doc-clean doc-uninstall sagelib-clean && git clean -fx src/sage && ./config.status && make build
+          ./bootstrap && make doc-clean doc-uninstall sagelib-clean && git clean -fx src/sage && ./config.status
+        working-directory: ./worktree-image
+        env:
+          MAKE: make -j2
+          SAGE_NUM_THREADS: 2
+
+      - name: Build
+        # This step is needed because building the modularized distributions installs some optional packages,
+        # so the editable install of sagelib needs to build the corresponding optional extension modules.
+        id: build
+        if: always() && (steps.incremental.outcome == 'success' || steps.clean.outcome == 'success')
+        run: |
+          make build
         working-directory: ./worktree-image
         env:
           MAKE: make -j2
@@ -125,22 +137,22 @@ jobs:
           COLUMNS: 120
 
       - name: Test all files (sage -t --all --long)
-        if: always() && (steps.incremental.outcome == 'success' || steps.build.outcome == 'success')
+        if: always() && steps.build.outcome == 'success'
         run: |
           ../sage -python -m pip install coverage
           ../sage -python -m coverage run ./bin/sage-runtests --all --long -p2 --random-seed=286735480429121101562228604801325644303
         working-directory: ./worktree-image/src
 
       - name: Prepare coverage results
-        if: always() && (steps.incremental.outcome == 'success' || steps.build.outcome == 'success')
+        if: always() && steps.build.outcome == 'success'
         run: |
           ./venv/bin/python3 -m coverage combine src/.coverage/
           ./venv/bin/python3 -m coverage xml
           find . -name *coverage*
         working-directory: ./worktree-image
 
       - name: Upload coverage to codecov
-        if: always() && (steps.incremental.outcome == 'success' || steps.build.outcome == 'success')
+        if: always() && steps.build.outcome == 'success'
         uses: codecov/codecov-action@v3
         with:
           files: ./worktree-image/coverage.xml

.gitignore

@@ -176,14 +176,32 @@ build/bin/sage-build-env-config
 /pkgs/*/.tox
 
 /pkgs/sagemath-objects/setup.cfg
+/pkgs/sagemath-bliss/setup.cfg
+/pkgs/sagemath-coxeter3/setup.cfg
+/pkgs/sagemath-mcqd/setup.cfg
+/pkgs/sagemath-meataxe/setup.cfg
+/pkgs/sagemath-sirocco/setup.cfg
+/pkgs/sagemath-tdlib/setup.cfg
 /pkgs/sagemath-categories/setup.cfg
 /pkgs/sagemath-environment/setup.cfg
 /pkgs/sagemath-repl/setup.cfg
 /pkgs/sagemath-objects/pyproject.toml
+/pkgs/sagemath-bliss/pyproject.toml
+/pkgs/sagemath-coxeter3/pyproject.toml
+/pkgs/sagemath-mcqd/pyproject.toml
+/pkgs/sagemath-meataxe/pyproject.toml
+/pkgs/sagemath-sirocco/pyproject.toml
+/pkgs/sagemath-tdlib/pyproject.toml
 /pkgs/sagemath-categories/pyproject.toml
 /pkgs/sagemath-environment/pyproject.toml
 /pkgs/sagemath-repl/pyproject.toml
 /pkgs/sagemath-objects/requirements.txt
+/pkgs/sagemath-bliss/requirements.txt
+/pkgs/sagemath-coxeter3/requirements.txt
+/pkgs/sagemath-mcqd/requirements.txt
+/pkgs/sagemath-meataxe/requirements.txt
+/pkgs/sagemath-sirocco/requirements.txt
+/pkgs/sagemath-tdlib/requirements.txt
 /pkgs/sagemath-categories/requirements.txt
 /pkgs/sagemath-environment/requirements.txt
 /pkgs/sagemath-repl/requirements.txt

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.1.beta7
+version: 10.1.beta9
 doi: 10.5281/zenodo.593563
-date-released: 2023-07-20
+date-released: 2023-08-05
 repository-code: "https://github.com/sagemath/sage"
 url: "https://www.sagemath.org/"

README.md

@@ -1 +1 @@
-SageMath version 10.1.beta7, Release Date: 2023-07-20
+SageMath version 10.1.beta9, Release Date: 2023-08-05

VERSION.txt

@@ -135,7 +135,13 @@ PYPI_WHEEL_PACKAGES =				\
 	sagemath_environment			\
 	sagemath_objects			\
 	sagemath_repl				\
-	sagemath_categories
+	sagemath_categories			\
+	sagemath_bliss 				\
+	sagemath_mcqd 				\
+	sagemath_tdlib				\
+	sagemath_coxeter3 			\
+	sagemath_sirocco			\
+	sagemath_meataxe
 
 # sage_docbuild is here, not in PYPI_WHEEL_PACKAGES, because it depends on sagelib
 WHEEL_PACKAGES = $(PYPI_WHEEL_PACKAGES)		\

build/make/Makefile.in

@@ -0,0 +1 @@
+sci-libs/bliss

build/pkgs/bliss/distros/gentoo.txt

@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=017780512407f8da87a091c485cf8c7162b5adaf
-md5=4e3e25464ee850c2593f16364bd6b206
-cksum=531215747
+sha1=0c03cb79520ba7f484e811aeb10ce528b3ea97d5
+md5=499635417f054c55dc90c9aca9494d61
+cksum=3916950255

build/pkgs/configure/checksums.ini

@@ -1 +1 @@
-98520945e069c603400cf2ae902a843f7a1bda13
+ffdd9f8e55c138555338187b059d80ceecc2abaf

build/pkgs/configure/package-version.txt

@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sage-conf ~= 10.1b7
+sage-conf ~= 10.1b9