Skip to content

Commit f829357

Browse files
author
Matthias Koeppe
committed
Merge tag '9.3.beta7' into t/31321/build_pkgs__add_some_missing_metadata
SageMath version 9.3.beta7, Release Date: 2021-02-07
2 parents 52add22 + 8453ffb commit f829357

File tree

250 files changed

+2917
-1781
lines changed

Some content is hidden

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

250 files changed

+2917
-1781
lines changed

‎.github/workflows/ci-cygwin-minimal.yml

+33-31
Large diffs are not rendered by default.

‎.github/workflows/ci-cygwin-standard.yml

+14-12
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ on:
66
push:
77
tags:
88
- '*'
9+
workflow_dispatch:
10+
# Allow to run manually
911

1012
env:
1113
MAKE: make -j8
@@ -43,7 +45,7 @@ jobs:
4345
shell: bash {0}
4446
run: |
4547
choco --version
46-
PACKAGES=$(sed 's/#.*//;' ./build/pkgs/cygwin.txt ./build/pkgs/cygwin-bootstrap.txt)
48+
PACKAGES=$(sed 's/#.*//;' ./build/pkgs/_prereq/distros/cygwin.txt ./build/pkgs/_prereq/distros/cygwin-bootstrap.txt)
4749
choco install $PACKAGES --source cygwin
4850
- name: bootstrap
4951
run: |
@@ -113,7 +115,7 @@ jobs:
113115
shell: bash {0}
114116
run: |
115117
choco --version
116-
PACKAGES=$(sed 's/#.*//;' ./build/pkgs/cygwin.txt ./build/pkgs/cygwin-bootstrap.txt)
118+
PACKAGES=$(sed 's/#.*//;' ./build/pkgs/_prereq/distros/cygwin.txt ./build/pkgs/_prereq/distros/cygwin-bootstrap.txt)
117119
choco install $PACKAGES --source cygwin
118120
- name: bootstrap
119121
run: |
@@ -188,7 +190,7 @@ jobs:
188190
shell: bash {0}
189191
run: |
190192
choco --version
191-
PACKAGES=$(sed 's/#.*//;' ./build/pkgs/cygwin.txt ./build/pkgs/cygwin-bootstrap.txt)
193+
PACKAGES=$(sed 's/#.*//;' ./build/pkgs/_prereq/distros/cygwin.txt ./build/pkgs/_prereq/distros/cygwin-bootstrap.txt)
192194
choco install $PACKAGES --source cygwin
193195
- name: bootstrap
194196
run: |
@@ -268,7 +270,7 @@ jobs:
268270
shell: bash {0}
269271
run: |
270272
choco --version
271-
PACKAGES=$(sed 's/#.*//;' ./build/pkgs/cygwin.txt ./build/pkgs/cygwin-bootstrap.txt)
273+
PACKAGES=$(sed 's/#.*//;' ./build/pkgs/_prereq/distros/cygwin.txt ./build/pkgs/_prereq/distros/cygwin-bootstrap.txt)
272274
choco install $PACKAGES --source cygwin
273275
- name: bootstrap
274276
run: |
@@ -346,7 +348,7 @@ jobs:
346348
shell: bash {0}
347349
run: |
348350
choco --version
349-
PACKAGES=$(sed 's/#.*//;' ./build/pkgs/cygwin.txt ./build/pkgs/cygwin-bootstrap.txt)
351+
PACKAGES=$(sed 's/#.*//;' ./build/pkgs/_prereq/distros/cygwin.txt ./build/pkgs/_prereq/distros/cygwin-bootstrap.txt)
350352
choco install $PACKAGES --source cygwin
351353
- name: bootstrap
352354
run: |
@@ -424,7 +426,7 @@ jobs:
424426
shell: bash {0}
425427
run: |
426428
choco --version
427-
PACKAGES=$(sed 's/#.*//;' ./build/pkgs/cygwin.txt ./build/pkgs/cygwin-bootstrap.txt)
429+
PACKAGES=$(sed 's/#.*//;' ./build/pkgs/_prereq/distros/cygwin.txt ./build/pkgs/_prereq/distros/cygwin-bootstrap.txt)
428430
choco install $PACKAGES --source cygwin
429431
- name: bootstrap
430432
run: |
@@ -502,7 +504,7 @@ jobs:
502504
shell: bash {0}
503505
run: |
504506
choco --version
505-
PACKAGES=$(sed 's/#.*//;' ./build/pkgs/cygwin.txt ./build/pkgs/cygwin-bootstrap.txt)
507+
PACKAGES=$(sed 's/#.*//;' ./build/pkgs/_prereq/distros/cygwin.txt ./build/pkgs/_prereq/distros/cygwin-bootstrap.txt)
506508
choco install $PACKAGES --source cygwin
507509
- name: bootstrap
508510
run: |
@@ -582,7 +584,7 @@ jobs:
582584
shell: bash {0}
583585
run: |
584586
choco --version
585-
PACKAGES=$(sed 's/#.*//;' ./build/pkgs/cygwin.txt ./build/pkgs/cygwin-bootstrap.txt)
587+
PACKAGES=$(sed 's/#.*//;' ./build/pkgs/_prereq/distros/cygwin.txt ./build/pkgs/_prereq/distros/cygwin-bootstrap.txt)
586588
choco install $PACKAGES --source cygwin
587589
- name: bootstrap
588590
run: |
@@ -662,7 +664,7 @@ jobs:
662664
shell: bash {0}
663665
run: |
664666
choco --version
665-
PACKAGES=$(sed 's/#.*//;' ./build/pkgs/cygwin.txt ./build/pkgs/cygwin-bootstrap.txt)
667+
PACKAGES=$(sed 's/#.*//;' ./build/pkgs/_prereq/distros/cygwin.txt ./build/pkgs/_prereq/distros/cygwin-bootstrap.txt)
666668
choco install $PACKAGES --source cygwin
667669
- name: bootstrap
668670
run: |
@@ -740,7 +742,7 @@ jobs:
740742
shell: bash {0}
741743
run: |
742744
choco --version
743-
PACKAGES=$(sed 's/#.*//;' ./build/pkgs/cygwin.txt ./build/pkgs/cygwin-bootstrap.txt)
745+
PACKAGES=$(sed 's/#.*//;' ./build/pkgs/_prereq/distros/cygwin.txt ./build/pkgs/_prereq/distros/cygwin-bootstrap.txt)
744746
choco install $PACKAGES --source cygwin
745747
- name: bootstrap
746748
run: |
@@ -818,7 +820,7 @@ jobs:
818820
shell: bash {0}
819821
run: |
820822
choco --version
821-
PACKAGES=$(sed 's/#.*//;' ./build/pkgs/cygwin.txt ./build/pkgs/cygwin-bootstrap.txt)
823+
PACKAGES=$(sed 's/#.*//;' ./build/pkgs/_prereq/distros/cygwin.txt ./build/pkgs/_prereq/distros/cygwin-bootstrap.txt)
822824
choco install $PACKAGES --source cygwin
823825
- name: bootstrap
824826
run: |
@@ -896,7 +898,7 @@ jobs:
896898
shell: bash {0}
897899
run: |
898900
choco --version
899-
PACKAGES=$(sed 's/#.*//;' ./build/pkgs/cygwin.txt ./build/pkgs/cygwin-bootstrap.txt)
901+
PACKAGES=$(sed 's/#.*//;' ./build/pkgs/_prereq/distros/cygwin.txt ./build/pkgs/_prereq/distros/cygwin-bootstrap.txt)
900902
choco install $PACKAGES --source cygwin
901903
- name: bootstrap
902904
run: |

‎.github/workflows/ci-wsl.yml

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ on:
99
branches:
1010
- 'public/build/**wsl**'
1111
workflow_dispatch:
12+
# Allow to run manually
1213

1314
jobs:
1415
windows:

‎.github/workflows/tox-experimental.yml

+2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ on:
2323
push:
2424
tags:
2525
- '*'
26+
workflow_dispatch:
27+
# Allow to run manually
2628

2729
env:
2830
TARGETS_PRE: build/make/Makefile

‎.github/workflows/tox-gcc_spkg.yml

+2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ on:
2323
push:
2424
tags:
2525
- '*'
26+
workflow_dispatch:
27+
# Allow to run manually
2628

2729
env:
2830
TARGETS_PRE: sagelib-build-deps

‎.github/workflows/tox-optional.yml

+2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ on:
2323
push:
2424
tags:
2525
- '*'
26+
workflow_dispatch:
27+
# Allow to run manually
2628

2729
env:
2830
TARGETS_PRE: build/make/Makefile

‎.github/workflows/tox.yml

+2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ on:
2323
push:
2424
tags:
2525
- '*'
26+
workflow_dispatch:
27+
# Allow to run manually
2628

2729
env:
2830
TARGETS_PRE: sagelib-build-deps

‎.zenodo.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"description": "Mirror of the Sage https://sagemath.org/ source tree",
33
"license": "other-open",
4-
"title": "sagemath/sage: 9.3.beta6",
5-
"version": "9.3.beta6",
4+
"title": "sagemath/sage: 9.3.beta7",
5+
"version": "9.3.beta7",
66
"upload_type": "software",
7-
"publication_date": "2021-01-17",
7+
"publication_date": "2021-02-07",
88
"creators": [
99
{
1010
"affiliation": "SageMath.org",
@@ -15,7 +15,7 @@
1515
"related_identifiers": [
1616
{
1717
"scheme": "url",
18-
"identifier": "https://github.com/sagemath/sage/tree/9.3.beta6",
18+
"identifier": "https://github.com/sagemath/sage/tree/9.3.beta7",
1919
"relation": "isSupplementTo"
2020
},
2121
{

‎Makefile

+40-1
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@ PTESTALL = ./sage -t -p --all
169169
# https://trac.sagemath.org/ticket/25345 and
170170
# https://trac.sagemath.org/ticket/26110.
171171
TESTALL_FLAGS = --optional=sage,dochtml,optional,external,build
172+
TESTALL_NODOC_FLAGS = --optional=sage,optional,external,build
172173

173174
test: all
174175
$(TESTALL) --logfile=logs/test.log
@@ -208,7 +209,45 @@ ptestoptional: all
208209
ptestoptionallong: all
209210
$(PTESTALL) --long --logfile=logs/ptestoptionallong.log
210211

211-
configure: bootstrap src/doc/bootstrap configure.ac src/bin/sage-version.sh m4/*.m4 build/pkgs/*/spkg-configure.m4 build/pkgs/*/type build/pkgs/*.txt build/pkgs/*/distros/*.txt
212+
test-nodoc: build
213+
$(TESTALL) --logfile=logs/test.log
214+
215+
check-nodoc: test-nodoc
216+
217+
testall-nodoc: build
218+
$(TESTALL) $(TESTALL_NODOC_FLAGS) --logfile=logs/testall.log
219+
220+
testlong-nodoc: build
221+
$(TESTALL) --long --logfile=logs/testlong.log
222+
223+
testalllong-nodoc: build
224+
$(TESTALL) --long $(TESTALL_NODOC_FLAGS) --logfile=logs/testalllong.log
225+
226+
ptest-nodoc: build
227+
$(PTESTALL) --logfile=logs/ptest.log
228+
229+
ptestall-nodoc: build
230+
$(PTESTALL) $(TESTALL_NODOC_FLAGS) --logfile=logs/ptestall.log
231+
232+
ptestlong-nodoc: build
233+
$(PTESTALL) --long --logfile=logs/ptestlong.log
234+
235+
ptestalllong-nodoc: build
236+
$(PTESTALL) --long $(TESTALL_NODOC_FLAGS) --logfile=logs/ptestalllong.log
237+
238+
testoptional-nodoc: build
239+
$(TESTALL) --logfile=logs/testoptional.log
240+
241+
testoptionallong-nodoc: build
242+
$(TESTALL) --long --logfile=logs/testoptionallong.log
243+
244+
ptestoptional-nodoc: build
245+
$(PTESTALL) --logfile=logs/ptestoptional.log
246+
247+
ptestoptionallong-nodoc: build
248+
$(PTESTALL) --long --logfile=logs/ptestoptionallong.log
249+
250+
configure: bootstrap src/doc/bootstrap configure.ac src/bin/sage-version.sh m4/*.m4 build/pkgs/*/spkg-configure.m4 build/pkgs/*/type build/pkgs/*/distros/*.txt
212251
./bootstrap -d
213252

214253
install: all

‎VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SageMath version 9.3.beta6, Release Date: 2021-01-17
1+
SageMath version 9.3.beta7, Release Date: 2021-02-07

‎bootstrap

+6-2
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,12 @@ bootstrap () {
8585
# --enable-SPKG options for installing pip packages
8686
if [ ! -f build/pkgs/$pkgname/requirements.txt ]; then
8787
pkgtype="$(cat build/pkgs/$pkgname/type)"
88-
spkg_configures="$spkg_configures
89-
SAGE_SPKG_ENABLE([$pkgname], [$pkgtype])"
88+
# Trac #29124: Do not provide --enable-_recommended and similar
89+
case "$pkgname" in
90+
_*) ;;
91+
*) spkg_configures="$spkg_configures
92+
SAGE_SPKG_ENABLE([$pkgname], [$pkgtype])" ;;
93+
esac
9094
fi
9195
done
9296
for pkgname in $(./sage --package list --has-file spkg-configure.m4 | sort); do

‎build/bin/sage-dist-helpers

+2-2
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ sdh_setup_bdist_wheel() {
204204
mkdir -p dist
205205
rm -f dist/*.whl
206206
BDIST_DIR="$(mktemp -d)"
207-
sage-python23 setup.py --no-user-cfg \
207+
python3 setup.py --no-user-cfg \
208208
bdist_wheel --bdist-dir "$BDIST_DIR" \
209209
"$@" || sdh_die "Error building a wheel for $PKG_NAME"
210210
}
@@ -221,7 +221,7 @@ sdh_pip_install() {
221221

222222
mkdir -p dist
223223
rm -f dist/*.whl
224-
sage-python23 -m pip wheel --wheel-dir=dist --no-binary :all: --verbose --no-deps --no-index --isolated --no-build-isolation "$@" || \
224+
python3 -m pip wheel --wheel-dir=dist --no-binary :all: --verbose --no-deps --no-index --isolated --no-build-isolation "$@" || \
225225
sdh_die "Error building a wheel for $PKG_NAME"
226226

227227
sdh_store_and_pip_install_wheel .

‎build/bin/sage-pip-install

+8-5
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,14 @@
1414
# ~/.pydistutils.cfg
1515
pip_install_flags="--ignore-installed --verbose --no-deps --no-index --isolated"
1616

17-
# Note: We need to take care to specify the full path to Sage's Python here
18-
# to emphasize that this command should use it, and not the system Python;
19-
# see https://trac.sagemath.org/ticket/18438
20-
# But now we delegate this to sage-python23.
21-
PYTHON=sage-python23
17+
# Note: "sage-pip-install" is meant to be run after $(PYTHON) has
18+
# been installed (either as an spkg or as a venv over a system python3).
19+
# It is then guaranteed by sage-env that PATH is set in a way that "python3"
20+
# refers to the correct python3.
21+
#
22+
# All SPKGs that use this script must therefore declare $(PYTHON) as a
23+
# dependency.
24+
PYTHON=python3
2225

2326
# The PIP variable is only used to determine the name of the lock file.
2427
PIP=pip3

‎build/bin/sage-pip-uninstall

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ if [ "$1" != "." ]; then
1212
exit 1
1313
fi
1414

15-
# Note: We need to take care to specify the full path to Sage's Python here
16-
# to emphasize that this command should use it, and not the system Python;
17-
# see https://trac.sagemath.org/ticket/18438
18-
# But now we delegate this to sage-python23.
19-
PYTHON=sage-python23
15+
# Note: "sage-pip-uninstall" is meant to be run after $(PYTHON) has
16+
# been installed (either as an spkg or as a venv over a system python3).
17+
# It is then guaranteed by sage-env that PATH is set in a way that "python3"
18+
# refers to the correct python3.
19+
PYTHON=python3
2020

2121
# The PIP variable is only used to determine the name of the lock file.
2222
PIP=pip3

‎build/bin/sage-print-system-package-command

+3-2
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ if [ -z "$system" -o -z "$command" ]; then
4949
fi
5050
system_packages="$*"
5151
options=
52+
env=
5253
shopt -s extglob
5354
case $system:$command in
5455
homebrew*:setup-build-env)
@@ -73,8 +74,8 @@ case $system:$command in
7374
;;
7475
@(debian*|ubuntu*):*)
7576
[ "$NO_INSTALL_RECOMMENDS" = yes ] && options="$options --no-install-recommends"
76-
[ "$YES" = yes ] && options="$options --yes"
77-
[ -n "$system_packages" ] && echo "${PROMPT}${SUDO}apt-get $command $options $system_packages"
77+
[ "$YES" = yes ] && options="$options --yes" env="DEBIAN_FRONTEND=noninteractive "
78+
[ -n "$system_packages" ] && echo "${PROMPT}${SUDO}${env}apt-get $command $options $system_packages"
7879
;;
7980
@(fedora*|redhat*|centos*):install)
8081
[ "$YES" = yes ] && options="$options -y"

‎build/bin/sage-python23

-27
This file was deleted.

‎build/bin/sage-spkg

-6
Original file line numberDiff line numberDiff line change
@@ -857,10 +857,4 @@ else
857857
fi
858858

859859

860-
# Touch this file to force a sage-location run next time Sage is
861-
# started. This is needed to make some of the installed libraries and
862-
# scripts independent of the SAGE_ROOT path.
863-
touch "$SAGE_LOCAL/lib/sage-force-relocate.txt"
864-
865-
866860
echo "Finished installing $PKG_NAME"

0 commit comments

Comments
 (0)