Skip to content

Commit 6308fe6

Browse files
kwankyukwankyu
committed
Merge branch 'develop' into p/36692/fix-doc-build
2 parents b894654 + 429555a commit 6308fe6

File tree

62 files changed

+180
-137
lines changed

Some content is hidden

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

62 files changed

+180
-137
lines changed

‎.github/workflows/ci-macos.yml

+1-1
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

-1
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

+1-1
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

+4-2
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

+10-10
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

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

‎VERSION.txt

+1-1
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.rc1, Release Date: 2023-11-10

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

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
python==3.10

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

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
python==3.11

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

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
python==3.12

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

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
python==3.9

‎build/pkgs/configure/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=configure-VERSION.tar.gz
2-
sha1=41ec9a0bdf6e5982204b26ce2593e4b5a1863c96
3-
md5=8ea80ef7438ed62345de677dc921af2e
4-
cksum=2979893163
2+
sha1=75fe450806e89ce82978f9167b664d3e403d9af9
3+
md5=26211fca17d4d912cc11f22f353684b1
4+
cksum=1423896271

‎build/pkgs/configure/package-version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
be0b5cf887fefcdf31df70be0a62b10b7929f28c
1+
e349b0024996e4ac4878d70a0a34ae6b742e88c5

‎build/pkgs/prompt_toolkit/distros/conda.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
prompt_toolkit
1+
prompt_toolkit>=3.0.5,<3.0.25

‎build/pkgs/pyzmq/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tarball=pyzmq-VERSION.tar.gz
2-
sha1=1a2e7220d7d1b6167c14ae2cc001dfc5d9a28dde
3-
md5=f10b7c3dee2c03557e2c5d00b73dfc7f
4-
cksum=1163982926
2+
sha1=f750e59a3d5fcca64d0a1a6723c1bc72173e976f
3+
md5=993a646d3f1c6201a8c93bcb2d2f867e
4+
cksum=2057198190
55
upstream_url=https://pypi.io/packages/source/p/pyzmq/pyzmq-VERSION.tar.gz

‎build/pkgs/pyzmq/package-version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
24.0.1
1+
25.1.1

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

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
From 29427869ce0a9f13e29c7f89873a1880c8be55a1 Mon Sep 17 00:00:00 2001
2+
From: Matthias Koeppe <[email protected]>
3+
Date: Sun, 5 Nov 2023 21:12:48 -0800
4+
Subject: [PATCH 1/2] setup.py: Remove setting of rpath
5+
6+
---
7+
setup.py | 2 --
8+
1 file changed, 2 deletions(-)
9+
10+
diff --git a/setup.py b/setup.py
11+
index d5c77a23..8a2a4943 100755
12+
--- a/setup.py
13+
+++ b/setup.py
14+
@@ -300,8 +300,6 @@ def settings_from_prefix(prefix=None):
15+
settings['include_dirs'] += [pjoin(env, 'include')]
16+
settings['library_dirs'] += [pjoin(env, 'lib')]
17+
18+
- for path in settings['library_dirs']:
19+
- _add_rpath(settings, os.path.abspath(path))
20+
info(settings)
21+
22+
return settings
23+
--
24+
2.42.0
25+

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

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
From b5bdcad66a28394f6e5be4ad7fd00835deec73f7 Mon Sep 17 00:00:00 2001
2+
From: Matthias Koeppe <[email protected]>
3+
Date: Sun, 5 Nov 2023 21:35:29 -0800
4+
Subject: [PATCH 2/2] setup.py: Patch out broken version detection
5+
6+
---
7+
setup.py | 1 +
8+
1 file changed, 1 insertion(+)
9+
10+
diff --git a/setup.py b/setup.py
11+
index 8a2a4943..19d31654 100755
12+
--- a/setup.py
13+
+++ b/setup.py
14+
@@ -463,6 +463,7 @@ class Configure(build_ext):
15+
16+
def check_zmq_version(self):
17+
"""check the zmq version"""
18+
+ return
19+
cfg = self.config
20+
# build test program
21+
zmq_prefix = cfg['zmq_prefix']
22+
--
23+
2.42.0
24+

‎build/pkgs/sage_conf/install-requires.txt

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

‎build/pkgs/sage_docbuild/install-requires.txt

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

‎build/pkgs/sage_setup/install-requires.txt

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

‎build/pkgs/sage_sws2rst/install-requires.txt

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

‎build/pkgs/sagelib/install-requires.txt

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

‎build/pkgs/sagemath_bliss/install-requires.txt

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

‎build/pkgs/sagemath_categories/install-requires.txt

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

‎build/pkgs/sagemath_coxeter3/install-requires.txt

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

‎build/pkgs/sagemath_environment/install-requires.txt

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

‎build/pkgs/sagemath_mcqd/install-requires.txt

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

‎build/pkgs/sagemath_meataxe/install-requires.txt

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

‎build/pkgs/sagemath_objects/install-requires.txt

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

‎build/pkgs/sagemath_repl/install-requires.txt

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

‎build/pkgs/sagemath_sirocco/install-requires.txt

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

‎build/pkgs/sagemath_tdlib/install-requires.txt

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

‎build/pkgs/zeromq/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tarball=zeromq-VERSION.tar.gz
2-
sha1=47277a64749049123d1401600e8cfbab10a3ae28
3-
md5=c897d4005a3f0b8276b00b7921412379
4-
cksum=1500782345
2+
sha1=bdbf686c8a40ba638e21cf74e34dbb425e108500
3+
md5=ae933b1e98411fd7cb8309f9502d2737
4+
cksum=1351453048
55
upstream_url=https://github.com/zeromq/libzmq/releases/download/vVERSION/zeromq-VERSION.tar.gz

‎build/pkgs/zeromq/package-version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.3.4
1+
4.3.5

‎build/pkgs/zeromq/patches/438d5d88392baffa6c2c5e0737d9de19d6686f0d.patch

-58
This file was deleted.

‎pkgs/sage-conf/.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
/_sage_conf/_conf.py
2-
/setup.cfg
32
/build
43
/dist
54
/*.egg-info

‎pkgs/sage-conf/VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.2.rc0
1+
10.2.rc1

‎pkgs/sage-conf_conda/VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.2.rc0
1+
10.2.rc1

‎pkgs/sage-conf_pypi/VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.2.rc0
1+
10.2.rc1

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

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../.upstream.d

‎pkgs/sage-conf_pypi/setup.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ def run(self):
3636
if os.environ.get('CONDA_PREFIX', ''):
3737
SETENV = ':'
3838
else:
39-
SETENV = '(. ./.homebrew-build-env 2> /dev/null || :)'
39+
SETENV = '. ./.homebrew-build-env 2> /dev/null'
4040

4141
SAGE_LOCAL = os.path.join(SAGE_ROOT, 'local')
4242

4343
if os.path.exists(os.path.join(SAGE_ROOT, 'config.status')):
4444
print(f'Reusing configured SAGE_ROOT={SAGE_ROOT}')
4545
else:
46-
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"
46+
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)"
4747
print(f"Running {cmd}")
4848
sys.stdout.flush()
4949
if os.system(cmd) != 0:
@@ -73,10 +73,10 @@ def run(self):
7373
# (that use native libraries shared with other packages).
7474
SETMAKE = 'if [ -z "$MAKE" ]; then export MAKE="make -j$(PATH=build/bin:$PATH build/bin/sage-build-num-threads | cut -d" " -f 2)"; fi'
7575
TARGETS = 'build'
76-
cmd = f'cd {SAGE_ROOT} && {SETENV} && {SETMAKE} && $MAKE V=0 {TARGETS}'
76+
cmd = f'cd {SAGE_ROOT} && ({SETENV}; {SETMAKE} && $MAKE V=0 ${{SAGE_CONF_TARGETS-{TARGETS}}})'
7777
print(f"Running {cmd}", flush=True)
7878
if os.system(cmd) != 0:
79-
raise DistutilsSetupError(f"make {TARGETS} failed")
79+
raise SetupError(f"make ${{SAGE_CONF_TARGETS-{TARGETS}}} failed")
8080

8181
setuptools_build_py.run(self)
8282

0 commit comments

Comments
 (0)