Merge branch 'develop' into ipython_3_11

Author: dimpase

.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