Skip to content

Commit e1874f9

Browse files
author
Matthias Koeppe
committed
Merge tag '10.2.rc2' into needs_for_sage_algebras
SageMath version 10.2.rc2, Release Date: 2023-11-12
2 parents ffa0785 + 4430e4c commit e1874f9

File tree

67 files changed

+251
-171
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+251
-171
lines changed

‎.github/workflows/ci-macos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ jobs:
8585
run: |
8686
git config --global user.email "[email protected]"
8787
git config --global user.name "Sage GitHub CI"
88-
SAGE_ROOT=. SAGE_SRC=./src src/bin/sage-update-version $(git describe) || echo "(ignoring error)"
88+
SAGE_ROOT=. SAGE_SRC=./src src/bin/sage-update-version $(git describe --tags) || echo "(ignoring error)"
8989
- name: make dist
9090
run: |
9191
./configure --enable-download-from-upstream-url && make dist

‎.github/workflows/doc-build.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,6 @@ jobs:
182182
echo '</body>' >> ./docs/CHANGES.html
183183
echo '</html>' >>./docs/CHANGES.html
184184
rm ./docs/diff.txt ./docs/diff.html
185-
(cd /sage/local/share/doc/sage/html && git reset --hard HEAD)
186185
# For some reason the deploy step below cannot find /sage/...
187186
# So copy everything from there to local folder
188187
# We also need to replace the symlinks because netlify is not following them

‎.github/workflows/doc-publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ jobs:
9494
9595
publish-live-doc:
9696
runs-on: ubuntu-latest
97-
if: github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.head_branch == 'develop'
97+
if: github.event.workflow_run.conclusion == 'success' && github.repository == 'sagemath/sage' && github.event.workflow_run.head_branch == 'develop'
9898
steps:
9999
- name: Download live doc
100100
uses: actions/[email protected]

‎.github/workflows/docker.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,13 @@ on:
5151
"almalinux-9-python3.11",
5252
"gentoo-python3.10",
5353
"gentoo-python3.11",
54-
"gentoo-python3.12",
5554
"archlinux-latest",
5655
"opensuse-15.3-gcc_11-python3.9",
5756
"opensuse-15.4-gcc_11-python3.10",
5857
"opensuse-15.5-gcc_11-python3.11",
5958
"opensuse-tumbleweed-python3.10",
6059
"opensuse-tumbleweed",
61-
"conda-forge",
60+
"conda-forge-python3.11",
6261
"ubuntu-bionic-gcc_8-i386",
6362
"debian-bullseye-i386",
6463
]
@@ -191,6 +190,9 @@ jobs:
191190
echo "DOCKER_PUSH_REPOSITORY=$(echo ${{ inputs.docker_push_repository }} | tr "[:upper:]" "[:lower:]")" >> $GITHUB_ENV
192191
echo "DOCKER_CONFIG_FILE=$HOME/.docker/config.json" >> $GITHUB_ENV
193192
fi
193+
194+
- name: Determine Docker tags to use
195+
run: |
194196
# This line needs to be run before the step "Merge CI fixes from sagemath/sage".
195197
DOCKER_TAG="$(git describe --dirty --always)"
196198
echo "DOCKER_TAG=$DOCKER_TAG" >> $GITHUB_ENV

‎.github/workflows/macos.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,16 @@ on:
2121
osversion_xcodeversion_toxenv_tuples:
2222
description: 'Stringified JSON object'
2323
default: >-
24-
[["latest", "", "homebrew-macos-usrlocal-minimal"],
25-
["latest", "", "homebrew-macos-usrlocal-standard"],
26-
["11", "xcode_11.7", "homebrew-macos-usrlocal-standard"],
27-
["12", "", "homebrew-macos-usrlocal-standard"],
28-
["13", "xcode_15.0", "homebrew-macos-usrlocal-standard"],
29-
["latest", "", "homebrew-macos-usrlocal-maximal"],
30-
["latest", "", "homebrew-macos-usrlocal-python3_xcode-standard"],
31-
["latest", "", "conda-forge-macos-minimal"],
32-
["latest", "", "conda-forge-macos-standard"],
33-
["latest", "", "conda-forge-macos-maximal"]]
24+
[["latest", "", "homebrew-macos-usrlocal-minimal"],
25+
["latest", "", "homebrew-macos-usrlocal-standard"],
26+
["11", "xcode_13.2.1", "homebrew-macos-usrlocal-standard"],
27+
["12", "", "homebrew-macos-usrlocal-standard"],
28+
["13", "xcode_15.0", "homebrew-macos-usrlocal-standard"],
29+
["latest", "", "homebrew-macos-usrlocal-maximal"],
30+
["latest", "", "homebrew-macos-usrlocal-python3_xcode-standard"],
31+
["latest", "", "conda-forge-macos-minimal"],
32+
["latest", "", "conda-forge-macos-standard"],
33+
["latest", "", "conda-forge-macos-maximal"]]
3434
type: string
3535
extra_sage_packages:
3636
description: 'Extra Sage packages to install as system packages'

‎CITATION.cff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ title: SageMath
44
abstract: SageMath is a free open-source mathematics software system.
55
authors:
66
- name: "The SageMath Developers"
7-
version: 10.2.rc0
7+
version: 10.2.rc2
88
doi: 10.5281/zenodo.593563
9-
date-released: 2023-11-05
9+
date-released: 2023-11-12
1010
repository-code: "https://github.com/sagemath/sage"
1111
url: "https://www.sagemath.org/"

‎VERSION.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SageMath version 10.2.rc0, Release Date: 2023-11-05
1+
SageMath version 10.2.rc2, Release Date: 2023-11-12

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
python==3.10

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
python==3.11

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
python==3.12

0 commit comments

Comments
 (0)