Skip to content

Commit edaa3e6

Browse files
author
Matthias Koeppe
committed
Merge tag '9.5.beta8' into t/32759/__configure___disable_doc
SageMath version 9.5.beta8, Release Date: 2021-12-12
2 parents 651c986 + d6d0edc commit edaa3e6

File tree

467 files changed

+7006
-4004
lines changed

Some content is hidden

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

467 files changed

+7006
-4004
lines changed

‎.github/workflows/tox-experimental.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
# This list is different from the one in tox.yml:
4242
# Trac #31526 switches gcc 4.x-based distributions to using the gcc_spkg configuration factor
4343
# Trac #32281 removes gcc 4.x-based distributions whose binutils are unusable
44-
tox_system_factor: [ubuntu-xenial, ubuntu-bionic, ubuntu-focal, ubuntu-groovy, ubuntu-hirsute, debian-jessie-gcc_spkg, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-18, linuxmint-19, linuxmint-19.3, linuxmint-20.1, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, centos-7-gcc_spkg, centos-8, gentoo, archlinux-latest, opensuse-15, opensuse-15.3, opensuse-tumbleweed, slackware-14.2, conda-forge, ubuntu-bionic-i386, manylinux-2_24-i686, debian-buster-i386, centos-7-i386-gcc_spkg]
44+
tox_system_factor: [ubuntu-xenial, ubuntu-bionic, ubuntu-focal, ubuntu-groovy, ubuntu-hirsute, debian-jessie-gcc_spkg, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-18, linuxmint-19, linuxmint-19.3, linuxmint-20.1, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, centos-7-gcc_spkg, centos-8, gentoo-python3.9, gentoo-python3.10, archlinux-latest, opensuse-15, opensuse-15.3, opensuse-tumbleweed, slackware-14.2, conda-forge, ubuntu-bionic-i386, manylinux-2_24-i686, debian-buster-i386, centos-7-i386-gcc_spkg]
4545
tox_packages_factor: [maximal]
4646
targets_pattern: [0-g, h-o, p, q-z]
4747
env:

‎.github/workflows/tox-optional.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
# This list is different from the one in tox.yml:
4242
# Trac #31526 switches gcc 4.x-based distributions to using the gcc_spkg configuration factor
4343
# Trac #32281 removes gcc 4.x-based distributions whose binutils are unusable
44-
tox_system_factor: [ubuntu-xenial, ubuntu-bionic, ubuntu-focal, ubuntu-groovy, ubuntu-hirsute, debian-jessie-gcc_spkg, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-18, linuxmint-19, linuxmint-19.3, linuxmint-20.1, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, centos-7-gcc_spkg, centos-8, gentoo, archlinux-latest, opensuse-15, opensuse-15.3, opensuse-tumbleweed, slackware-14.2, conda-forge, ubuntu-bionic-i386, manylinux-2_24-i686, debian-buster-i386, centos-7-i386-gcc_spkg]
44+
tox_system_factor: [ubuntu-xenial, ubuntu-bionic, ubuntu-focal, ubuntu-groovy, ubuntu-hirsute, debian-jessie-gcc_spkg, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-18, linuxmint-19, linuxmint-19.3, linuxmint-20.1, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, centos-7-gcc_spkg, centos-8, gentoo-python3.9, gentoo-python3.10, archlinux-latest, opensuse-15, opensuse-15.3, opensuse-tumbleweed, slackware-14.2, conda-forge, ubuntu-bionic-i386, manylinux-2_24-i686, debian-buster-i386, centos-7-i386-gcc_spkg]
4545
tox_packages_factor: [maximal]
4646
targets_pattern: [0-g, h-o, p, q-z]
4747
env:

‎.github/workflows/tox.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
fail-fast: false
3939
max-parallel: 20
4040
matrix:
41-
tox_system_factor: [ubuntu-trusty, ubuntu-xenial, ubuntu-bionic, ubuntu-focal, ubuntu-groovy, ubuntu-hirsute, ubuntu-impish, debian-jessie, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-17, linuxmint-18, linuxmint-19, linuxmint-19.3, linuxmint-20.1, linuxmint-20.2, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, fedora-35, centos-7, centos-8, gentoo, gentoo-python3.7, archlinux-latest, opensuse-15, opensuse-15.3, opensuse-tumbleweed, slackware-14.2, conda-forge, ubuntu-bionic-i386, manylinux-2_24-i686, debian-buster-i386, centos-7-i386]
41+
tox_system_factor: [ubuntu-trusty, ubuntu-xenial, ubuntu-bionic, ubuntu-focal, ubuntu-groovy, ubuntu-hirsute, ubuntu-impish, debian-jessie, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-17, linuxmint-18, linuxmint-19, linuxmint-19.3, linuxmint-20.1, linuxmint-20.2, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, fedora-35, centos-7, centos-8, gentoo-python3.9, gentoo-python3.10, archlinux-latest, opensuse-15, opensuse-15.3, opensuse-tumbleweed, slackware-14.2, conda-forge, ubuntu-bionic-i386, manylinux-2_24-i686, debian-buster-i386, centos-7-i386]
4242
tox_packages_factor: [minimal, standard]
4343
env:
4444
TOX_ENV: docker-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}

‎.zenodo.json

Lines changed: 4 additions & 4 deletions
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.5.beta6",
5-
"version": "9.5.beta6",
4+
"title": "sagemath/sage: 9.5.beta8",
5+
"version": "9.5.beta8",
66
"upload_type": "software",
7-
"publication_date": "2021-11-12",
7+
"publication_date": "2021-12-12",
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.5.beta6",
18+
"identifier": "https://github.com/sagemath/sage/tree/9.5.beta8",
1919
"relation": "isSupplementTo"
2020
},
2121
{

‎VERSION.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SageMath version 9.5.beta6, Release Date: 2021-11-12
1+
SageMath version 9.5.beta8, Release Date: 2021-12-12

‎build/bin/sage-bootstrap-python

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,19 @@ if [ "$LC_ALL" = "C" -o "$LANG" = "C" -o "$LC_CTYPE" = "C" ]; then
4040
export LANG
4141
fi
4242

43-
PYTHONS="python python3 python3.8 python3.7 python2.7 python3.6 python2"
43+
PYTHONS="python python3 python3.10 python3.9 python3.8 python3.7 python2.7 python3.6 python2"
44+
# Trac #32405: Prefer a Python that provides ssl with SNI, which allows developers
45+
# to download from upstream URLs (configure --enable-download-from-upstream-url),
46+
# in particular from PyPI, which requires SNI.
47+
for PY in $PYTHONS; do
48+
PYTHON="$(PATH="$SAGE_ORIG_PATH" command -v $PY)"
49+
if [ -n "$PYTHON" ]; then
50+
if "$PYTHON" -c "import argparse; import urllib; from hashlib import sha1; from ssl import HAS_SNI; assert HAS_SNI; from os import listdir; listdir(\"$(pwd)\");" 2>/dev/null; then
51+
exec "$PYTHON" "$@"
52+
fi
53+
fi
54+
done
55+
# Second round, no ssl/SNI test.
4456
for PY in $PYTHONS; do
4557
PYTHON="$(PATH="$SAGE_ORIG_PATH" command -v $PY)"
4658
if [ -n "$PYTHON" ]; then

‎build/bin/sage-build-env

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,5 +170,8 @@ if [ "x$SAGE_BUILD_ENV_SOURCED" = "x" ]; then
170170
fi
171171

172172
# Trac #31335: Avoid include paths leaking in from homebrew python3's distutils.cfg
173-
# by using setuptools' own copy of distutils instead of relying on stdlib distutils.
174-
export SETUPTOOLS_USE_DISTUTILS=local
173+
# by using setuptools' own copy of distutils instead of relying on stdlib distutils
174+
# Trac #32944: Only do this on homebrew.
175+
if [ -n "$HOMEBREW" ]; then
176+
export SETUPTOOLS_USE_DISTUTILS=local
177+
fi

‎build/bin/sage-dist-helpers

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,12 +262,18 @@ sdh_pip_install() {
262262
esac
263263
shift
264264
done
265-
python3 -m pip wheel --use-feature=in-tree-build --wheel-dir=dist --verbose --no-deps --no-index --isolated --ignore-requires-python $build_isolation_option "$@" || \
265+
python3 -m pip wheel --wheel-dir=dist --verbose --no-deps --no-index --isolated --ignore-requires-python $build_isolation_option "$@" || \
266266
sdh_die "Error building a wheel for $PKG_NAME"
267267

268268
sdh_store_and_pip_install_wheel $install_options .
269269
}
270270

271+
sdh_pip_editable_install() {
272+
echo "Installing $PKG_NAME (editable mode)"
273+
python3 -m pip install --verbose --no-deps --no-index --no-build-isolation --isolated --editable "$@" || \
274+
sdh_die "Error installing $PKG_NAME"
275+
}
276+
271277
sdh_store_wheel() {
272278
if [ -n "$SAGE_DESTDIR" ]; then
273279
local sudo=""

‎build/make/Makefile.in

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -338,12 +338,11 @@ doc-html: sagemath_doc_html
338338
doc-html-no-plot: doc-clean
339339
+$(MAKE_REC) SAGE_DOCBUILD_OPTS="$(SAGE_DOCBUILD_OPTS) --no-plot" doc-html
340340

341-
# Using mathjax is actually the default, but this target can be used
342-
# to override an environment setting of SAGE_DOC_MATHJAX=no
343-
doc-html-mathjax:
344-
+$(MAKE_REC) SAGE_DOCBUILD_OPTS="$(SAGE_DOCBUILD_OPTS) -j" doc-html
341+
# Using mathjax is actually the only options, but we keep
342+
# this target for backwards compatibility.
343+
doc-html-mathjax: doc-html
345344

346-
# Keep target 'doc-html-jsmath' for backwards compatibility.
345+
# Also Keep target 'doc-html-jsmath' for backwards compatibility.
347346
doc-html-jsmath: doc-html-mathjax
348347

349348
doc-pdf: sagemath_doc_pdf

‎build/pkgs/beniget/SPKG.rst

Lines changed: 18 additions & 0 deletions

0 commit comments

Comments
 (0)