Merge branch 'develop' into graphs/optional_tags

.github/workflows/ci-macos.yml

@@ -85,7 +85,7 @@ jobs:
         run: |
           git config --global user.email "nobody@example.com"
           git config --global user.name "Sage GitHub CI"
-          SAGE_ROOT=. SAGE_SRC=./src src/bin/sage-update-version $(git describe) || echo "(ignoring error)"
+          SAGE_ROOT=. SAGE_SRC=./src src/bin/sage-update-version $(git describe --tags) || echo "(ignoring error)"
       - name: make dist
         run: |
           ./configure --enable-download-from-upstream-url && make dist

.github/workflows/doc-build.yml

@@ -182,7 +182,6 @@ jobs:
           echo '</body>' >> ./docs/CHANGES.html
           echo '</html>' >>./docs/CHANGES.html
           rm ./docs/diff.txt ./docs/diff.html
-          (cd /sage/local/share/doc/sage/html && git reset --hard HEAD)
           # For some reason the deploy step below cannot find /sage/...
           # So copy everything from there to local folder
           # We also need to replace the symlinks because netlify is not following them

.github/workflows/doc-publish.yml

@@ -94,7 +94,7 @@ jobs:
 
   publish-live-doc:
     runs-on: ubuntu-latest
-    if: github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.head_branch == 'develop'
+    if: github.event.workflow_run.conclusion == 'success' && github.repository == 'sagemath/sage' && github.event.workflow_run.head_branch == 'develop'
     steps:
       - name: Download live doc
         uses: actions/github-script@v6.4.1

.github/workflows/docker.yml

@@ -51,14 +51,13 @@ on:
            "almalinux-9-python3.11",
            "gentoo-python3.10",
            "gentoo-python3.11",
-           "gentoo-python3.12",
            "archlinux-latest",
            "opensuse-15.3-gcc_11-python3.9",
            "opensuse-15.4-gcc_11-python3.10",
            "opensuse-15.5-gcc_11-python3.11",
            "opensuse-tumbleweed-python3.10",
            "opensuse-tumbleweed",
-           "conda-forge",
+           "conda-forge-python3.11",
            "ubuntu-bionic-gcc_8-i386",
            "debian-bullseye-i386",
            ]
@@ -191,6 +190,9 @@ jobs:
               echo "DOCKER_PUSH_REPOSITORY=$(echo ${{ inputs.docker_push_repository }} | tr "[:upper:]" "[:lower:]")" >> $GITHUB_ENV
               echo "DOCKER_CONFIG_FILE=$HOME/.docker/config.json" >> $GITHUB_ENV
             fi
+
+      - name: Determine Docker tags to use
+        run: |
             # This line needs to be run before the step "Merge CI fixes from sagemath/sage".
             DOCKER_TAG="$(git describe --dirty --always)"
             echo "DOCKER_TAG=$DOCKER_TAG" >> $GITHUB_ENV

.github/workflows/macos.yml

@@ -21,16 +21,16 @@ on:
       osversion_xcodeversion_toxenv_tuples:
         description: 'Stringified JSON object'
         default: >-
-          [["latest", "",           "homebrew-macos-usrlocal-minimal"],
-           ["latest", "",           "homebrew-macos-usrlocal-standard"],
-           ["11",     "xcode_11.7", "homebrew-macos-usrlocal-standard"],
-           ["12",     "",           "homebrew-macos-usrlocal-standard"],
-           ["13",     "xcode_15.0", "homebrew-macos-usrlocal-standard"],
-           ["latest", "",           "homebrew-macos-usrlocal-maximal"],
-           ["latest", "",           "homebrew-macos-usrlocal-python3_xcode-standard"],
-           ["latest", "",           "conda-forge-macos-minimal"],
-           ["latest", "",           "conda-forge-macos-standard"],
-           ["latest", "",           "conda-forge-macos-maximal"]]
+          [["latest", "",             "homebrew-macos-usrlocal-minimal"],
+           ["latest", "",             "homebrew-macos-usrlocal-standard"],
+           ["11",     "xcode_13.2.1", "homebrew-macos-usrlocal-standard"],
+           ["12",     "",             "homebrew-macos-usrlocal-standard"],
+           ["13",     "xcode_15.0",   "homebrew-macos-usrlocal-standard"],
+           ["latest", "",             "homebrew-macos-usrlocal-maximal"],
+           ["latest", "",             "homebrew-macos-usrlocal-python3_xcode-standard"],
+           ["latest", "",             "conda-forge-macos-minimal"],
+           ["latest", "",             "conda-forge-macos-standard"],
+           ["latest", "",             "conda-forge-macos-maximal"]]
         type: string
       extra_sage_packages:
         description: 'Extra Sage packages to install as system packages'

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.2.rc0
+version: 10.2.rc1
 doi: 10.5281/zenodo.593563
-date-released: 2023-11-05
+date-released: 2023-11-10
 repository-code: "https://github.com/sagemath/sage"
 url: "https://www.sagemath.org/"

VERSION.txt

@@ -1 +1 @@
-SageMath version 10.2.rc0, Release Date: 2023-11-05
+SageMath version 10.2.rc1, Release Date: 2023-11-10

build/pkgs/_python3.10/distros/conda.txt

@@ -0,0 +1 @@
+python==3.10

build/pkgs/_python3.11/distros/conda.txt

@@ -0,0 +1 @@
+python==3.11

build/pkgs/_python3.12/distros/conda.txt

@@ -0,0 +1 @@
+python==3.12

build/pkgs/_python3.9/distros/conda.txt

@@ -0,0 +1 @@
+python==3.9

build/pkgs/configure/checksums.ini

@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=41ec9a0bdf6e5982204b26ce2593e4b5a1863c96
-md5=8ea80ef7438ed62345de677dc921af2e
-cksum=2979893163
+sha1=75fe450806e89ce82978f9167b664d3e403d9af9
+md5=26211fca17d4d912cc11f22f353684b1
+cksum=1423896271

build/pkgs/configure/package-version.txt

@@ -1 +1 @@
-be0b5cf887fefcdf31df70be0a62b10b7929f28c
+e349b0024996e4ac4878d70a0a34ae6b742e88c5

build/pkgs/prompt_toolkit/distros/conda.txt

@@ -1 +1 @@
-prompt_toolkit
+prompt_toolkit>=3.0.5,<3.0.25

build/pkgs/pyzmq/checksums.ini

@@ -1,5 +1,5 @@
 tarball=pyzmq-VERSION.tar.gz
-sha1=1a2e7220d7d1b6167c14ae2cc001dfc5d9a28dde
-md5=f10b7c3dee2c03557e2c5d00b73dfc7f
-cksum=1163982926
+sha1=f750e59a3d5fcca64d0a1a6723c1bc72173e976f
+md5=993a646d3f1c6201a8c93bcb2d2f867e
+cksum=2057198190
 upstream_url=https://pypi.io/packages/source/p/pyzmq/pyzmq-VERSION.tar.gz

build/pkgs/pyzmq/package-version.txt

@@ -1 +1 @@
-24.0.1
+25.1.1

build/pkgs/pyzmq/patches/0001-setup.py-Remove-setting-of-rpath.patch

@@ -0,0 +1,25 @@
+From 29427869ce0a9f13e29c7f89873a1880c8be55a1 Mon Sep 17 00:00:00 2001
+From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
+Date: Sun, 5 Nov 2023 21:12:48 -0800
+Subject: [PATCH 1/2] setup.py: Remove setting of rpath
+
+---
+ setup.py | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index d5c77a23..8a2a4943 100755
+--- a/setup.py
++++ b/setup.py
+@@ -300,8 +300,6 @@ def settings_from_prefix(prefix=None):
+                     settings['include_dirs'] += [pjoin(env, 'include')]
+                     settings['library_dirs'] += [pjoin(env, 'lib')]
+
+-        for path in settings['library_dirs']:
+-            _add_rpath(settings, os.path.abspath(path))
+     info(settings)
+
+     return settings
+-- 
+2.42.0
+

build/pkgs/pyzmq/patches/0002-setup.py-Patch-out-broken-version-detection.patch

@@ -0,0 +1,24 @@
+From b5bdcad66a28394f6e5be4ad7fd00835deec73f7 Mon Sep 17 00:00:00 2001
+From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
+Date: Sun, 5 Nov 2023 21:35:29 -0800
+Subject: [PATCH 2/2] setup.py: Patch out broken version detection
+
+---
+ setup.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/setup.py b/setup.py
+index 8a2a4943..19d31654 100755
+--- a/setup.py
++++ b/setup.py
+@@ -463,6 +463,7 @@ class Configure(build_ext):
+
+     def check_zmq_version(self):
+         """check the zmq version"""
++        return
+         cfg = self.config
+         # build test program
+         zmq_prefix = cfg['zmq_prefix']
+-- 
+2.42.0
+

build/pkgs/sage_conf/install-requires.txt

@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sage-conf ~= 10.2rc0
+sage-conf ~= 10.2rc1

build/pkgs/sage_docbuild/install-requires.txt

@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sage-docbuild ~= 10.2rc0
+sage-docbuild ~= 10.2rc1

build/pkgs/sage_setup/install-requires.txt

@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sage-setup ~= 10.2rc0
+sage-setup ~= 10.2rc1

build/pkgs/sage_sws2rst/install-requires.txt

@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sage-sws2rst ~= 10.2rc0
+sage-sws2rst ~= 10.2rc1

build/pkgs/sagelib/install-requires.txt

@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sagemath-standard ~= 10.2rc0
+sagemath-standard ~= 10.2rc1

build/pkgs/sagemath_bliss/install-requires.txt

@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sagemath-bliss ~= 10.2rc0
+sagemath-bliss ~= 10.2rc1

build/pkgs/sagemath_categories/install-requires.txt

@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sagemath-categories ~= 10.2rc0
+sagemath-categories ~= 10.2rc1

build/pkgs/sagemath_coxeter3/install-requires.txt

@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sagemath-coxeter3 ~= 10.2rc0
+sagemath-coxeter3 ~= 10.2rc1

build/pkgs/sagemath_environment/install-requires.txt

@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sagemath-environment ~= 10.2rc0
+sagemath-environment ~= 10.2rc1

build/pkgs/sagemath_mcqd/install-requires.txt

@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sagemath-mcqd ~= 10.2rc0
+sagemath-mcqd ~= 10.2rc1

build/pkgs/sagemath_meataxe/install-requires.txt

@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sagemath-meataxe ~= 10.2rc0
+sagemath-meataxe ~= 10.2rc1

build/pkgs/sagemath_objects/install-requires.txt

@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sagemath-objects ~= 10.2rc0
+sagemath-objects ~= 10.2rc1

build/pkgs/sagemath_repl/install-requires.txt

@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sagemath-repl ~= 10.2rc0
+sagemath-repl ~= 10.2rc1

build/pkgs/sagemath_sirocco/install-requires.txt

@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sagemath-sirocco ~= 10.2rc0
+sagemath-sirocco ~= 10.2rc1

build/pkgs/sagemath_tdlib/install-requires.txt

@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sagemath-tdlib ~= 10.2rc0
+sagemath-tdlib ~= 10.2rc1

build/pkgs/zeromq/checksums.ini

@@ -1,5 +1,5 @@
 tarball=zeromq-VERSION.tar.gz
-sha1=47277a64749049123d1401600e8cfbab10a3ae28
-md5=c897d4005a3f0b8276b00b7921412379
-cksum=1500782345
+sha1=bdbf686c8a40ba638e21cf74e34dbb425e108500
+md5=ae933b1e98411fd7cb8309f9502d2737
+cksum=1351453048
 upstream_url=https://github.com/zeromq/libzmq/releases/download/vVERSION/zeromq-VERSION.tar.gz

build/pkgs/zeromq/package-version.txt

@@ -1 +1 @@
-4.3.4
+4.3.5

pkgs/sage-conf/.gitignore

@@ -1,5 +1,4 @@
 /_sage_conf/_conf.py
-/setup.cfg
 /build
 /dist
 /*.egg-info

pkgs/sage-conf/VERSION.txt

@@ -1 +1 @@
-10.2.rc0
+10.2.rc1

pkgs/sage-conf_conda/VERSION.txt

@@ -1 +1 @@
-10.2.rc0
+10.2.rc1

pkgs/sage-conf_pypi/VERSION.txt

@@ -1 +1 @@
-10.2.rc0
+10.2.rc1

pkgs/sage-conf_pypi/sage_root/.upstream.d

@@ -0,0 +1 @@
+../../../.upstream.d

pkgs/sage-conf_pypi/setup.py

@@ -36,14 +36,14 @@ def run(self):
         if os.environ.get('CONDA_PREFIX', ''):
             SETENV = ':'
         else:
-            SETENV = '(. ./.homebrew-build-env 2> /dev/null || :)'
+            SETENV = '. ./.homebrew-build-env 2> /dev/null'
 
         SAGE_LOCAL = os.path.join(SAGE_ROOT, 'local')
 
         if os.path.exists(os.path.join(SAGE_ROOT, 'config.status')):
             print(f'Reusing configured SAGE_ROOT={SAGE_ROOT}')
         else:
-            cmd = f"cd {SAGE_ROOT} && {SETENV} && ./configure --prefix={SAGE_LOCAL} --with-python={sys.executable} --enable-build-as-root --enable-download-from-upstream-url --with-system-python3=force --with-sage-venv --disable-notebook --disable-sagelib --disable-sage_conf --disable-doc"
+            cmd = f"cd {SAGE_ROOT} && ({SETENV}; ./configure --prefix={SAGE_LOCAL} --with-python={sys.executable} --enable-build-as-root --enable-download-from-upstream-url --with-system-python3=force --with-sage-venv --disable-notebook --disable-sagelib --disable-sage_conf --disable-doc)"
             print(f"Running {cmd}")
             sys.stdout.flush()
             if os.system(cmd) != 0:
@@ -73,10 +73,10 @@ def run(self):
         # (that use native libraries shared with other packages).
         SETMAKE = 'if [ -z "$MAKE" ]; then export MAKE="make -j$(PATH=build/bin:$PATH build/bin/sage-build-num-threads | cut -d" " -f 2)"; fi'
         TARGETS = 'build'
-        cmd = f'cd {SAGE_ROOT} && {SETENV} && {SETMAKE} && $MAKE V=0 {TARGETS}'
+        cmd = f'cd {SAGE_ROOT} && ({SETENV}; {SETMAKE} && $MAKE V=0 ${{SAGE_CONF_TARGETS-{TARGETS}}})'
         print(f"Running {cmd}", flush=True)
         if os.system(cmd) != 0:
-            raise DistutilsSetupError(f"make {TARGETS} failed")
+            raise SetupError(f"make ${{SAGE_CONF_TARGETS-{TARGETS}}} failed")
 
         setuptools_build_py.run(self)