Skip to content
This repository was archived by the owner on Jan 30, 2023. It is now read-only.

Commit 93ca1f7

Browse files
author
Matthias Koeppe
committed
Merge tag '9.7.beta3' into t/33295/refactor_sage_conf
SageMath version 9.7.beta3, Release Date: 2022-06-19
2 parents fbb318d + f8df808 commit 93ca1f7

File tree

299 files changed

+4823
-2463
lines changed

Some content is hidden

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

299 files changed

+4823
-2463
lines changed

.github/workflows/tox-experimental.yml

+1-4
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,7 @@ jobs:
3838
fail-fast: false
3939
max-parallel: 6
4040
matrix:
41-
# This list is different from the one in tox.yml:
42-
# Trac #31526 switches gcc 4.x-based distributions to using the gcc_spkg configuration factor
43-
# Trac #32281 removes gcc 4.x-based distributions whose binutils are unusable
44-
tox_system_factor: [ubuntu-xenial, ubuntu-bionic, ubuntu-focal, ubuntu-hirsute, ubuntu-impish, ubuntu-jammy, debian-stretch, debian-buster, debian-bullseye, debian-bookworm, debian-sid, linuxmint-18, linuxmint-19, linuxmint-19.3, linuxmint-20.1, linuxmint-20.2. linuxmint-20.3, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, fedora-35, fedora-36, centos-7-gcc_spkg, centos-stream-8, gentoo-python3.9, gentoo-python3.10, archlinux-latest, 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]
41+
tox_system_factor: [gitpod, ubuntu-trusty-toolchain-gcc_9, ubuntu-xenial-toolchain-gcc_9, ubuntu-bionic, ubuntu-focal, ubuntu-hirsute, ubuntu-impish, ubuntu-jammy, ubuntu-kinetic, debian-stretch, debian-buster, debian-bullseye, debian-bookworm, debian-sid, linuxmint-19, linuxmint-19.3, linuxmint-20.1, linuxmint-20.2, linuxmint-20.3, linuxmint-21, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, fedora-35, fedora-36, fedora-37, centos-7-devtoolset-gcc_11, centos-stream-8, gentoo-python3.9, gentoo-python3.10, archlinux-latest, opensuse-15.3, opensuse-tumbleweed, conda-forge, ubuntu-bionic-i386, manylinux-2_24-i686, debian-buster-i386, centos-7-i386-devtoolset-gcc_11]
4542
tox_packages_factor: [maximal]
4643
targets_pattern: [0-g, h-o, p, q-z]
4744
env:

.github/workflows/tox-optional.yml

+1-4
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,7 @@ jobs:
3838
fail-fast: false
3939
max-parallel: 6
4040
matrix:
41-
# This list is different from the one in tox.yml:
42-
# Trac #31526 switches gcc 4.x-based distributions to using the gcc_spkg configuration factor
43-
# Trac #32281 removes gcc 4.x-based distributions whose binutils are unusable
44-
tox_system_factor: [ubuntu-xenial, ubuntu-bionic, ubuntu-focal, ubuntu-hirsute, ubuntu-impish, ubuntu-jammy, debian-stretch, debian-buster, debian-bullseye, debian-bookworm, debian-sid, linuxmint-18, linuxmint-19, linuxmint-19.3, linuxmint-20.1, linuxmint-20.2. linuxmint-20.3, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, fedora-35, fedora-36, centos-7-gcc_spkg, centos-stream-8, gentoo-python3.9, gentoo-python3.10, archlinux-latest, 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]
41+
tox_system_factor: [gitpod, ubuntu-trusty-toolchain-gcc_9, ubuntu-xenial-toolchain-gcc_9, ubuntu-bionic, ubuntu-focal, ubuntu-hirsute, ubuntu-impish, ubuntu-jammy, ubuntu-kinetic, debian-stretch, debian-buster, debian-bullseye, debian-bookworm, debian-sid, linuxmint-19, linuxmint-19.3, linuxmint-20.1, linuxmint-20.2, linuxmint-20.3, linuxmint-21, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, fedora-35, fedora-36, fedora-37, centos-7-devtoolset-gcc_11, centos-stream-8, gentoo-python3.9, gentoo-python3.10, archlinux-latest, opensuse-15.3, opensuse-tumbleweed, conda-forge, ubuntu-bionic-i386, manylinux-2_24-i686, debian-buster-i386, centos-7-i386-devtoolset-gcc_11]
4542
tox_packages_factor: [maximal]
4643
targets_pattern: [0-g, h-o, p, q-z]
4744
env:

.github/workflows/tox.yml

+1-1
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-hirsute, ubuntu-impish, ubuntu-jammy, debian-stretch, debian-buster, debian-bullseye, debian-bookworm, debian-sid, linuxmint-17, linuxmint-18, linuxmint-19, linuxmint-19.3, linuxmint-20.1, linuxmint-20.2, linuxmint-20.3, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, fedora-35, fedora-36, centos-7, centos-stream-8, gentoo-python3.9, gentoo-python3.10, archlinux-latest, 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-toolchain-gcc_9, ubuntu-xenial-toolchain-gcc_9, ubuntu-bionic, ubuntu-focal, ubuntu-hirsute, ubuntu-impish, ubuntu-jammy, ubuntu-kinetic, debian-stretch, debian-buster, debian-bullseye, debian-bookworm, debian-sid, linuxmint-19, linuxmint-19.3, linuxmint-20.1, linuxmint-20.2, linuxmint-20.3, linuxmint-21, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, fedora-35, fedora-36, fedora-37, centos-7-devtoolset-gcc_11, centos-stream-8, gentoo-python3.9, gentoo-python3.10, archlinux-latest, opensuse-15.3, opensuse-tumbleweed, conda-forge, ubuntu-bionic-i386, manylinux-2_24-i686, debian-buster-i386, centos-7-i386-devtoolset-gcc_11]
4242
tox_packages_factor: [minimal, standard]
4343
env:
4444
TOX_ENV: docker-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,7 @@ build/bin/sage-build-env-config
187187

188188
# Generated by docbuild
189189
/src/doc/en/reference/*/sage
190+
/src/doc/en/reference/*/sage_docbuild
190191
/src/doc/en/reference/sage
191192
/src/doc/en/reference/spkg/*.rst
192193
/src/doc/output

.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.7.beta2",
5-
"version": "9.7.beta2",
4+
"title": "sagemath/sage: 9.7.beta3",
5+
"version": "9.7.beta3",
66
"upload_type": "software",
7-
"publication_date": "2022-06-12",
7+
"publication_date": "2022-06-19",
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.7.beta2",
18+
"identifier": "https://github.com/sagemath/sage/tree/9.7.beta3",
1919
"relation": "isSupplementTo"
2020
},
2121
{

README.md

+2-2

VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SageMath version 9.7.beta2, Release Date: 2022-06-12
1+
SageMath version 9.7.beta3, Release Date: 2022-06-19

build/bin/write-dockerfile.sh

+4-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ EXTRA_SAGE_PACKAGES="${5:-_bootstrap}"
1313
STRIP_COMMENTS="sed s/#.*//;"
1414
SAGE_ROOT=.
1515
export PATH="$SAGE_ROOT"/build/bin:$PATH
16-
SYSTEM_PACKAGES=
16+
SYSTEM_PACKAGES=$EXTRA_SYSTEM_PACKAGES
1717
CONFIGURE_ARGS="--enable-option-checking "
1818
for PKG_BASE in $($SAGE_ROOT/sage -package list --has-file=distros/$SYSTEM.txt $SAGE_PACKAGE_LIST_ARGS) $EXTRA_SAGE_PACKAGES; do
1919
PKG_SCRIPTS="$SAGE_ROOT"/build/pkgs/$PKG_BASE
@@ -60,6 +60,9 @@ RUN $UPDATE $INSTALL software-properties-common && ($INSTALL gpg gpg-agent || ec
6060
RUN $SUDO add-apt-repository $EXTRA_REPOSITORY
6161
EOF
6262
fi
63+
if [ -n "$EXTRA_PATH" ]; then
64+
RUN="RUN export PATH=$EXTRA_PATH:\$PATH && "
65+
fi
6366
;;
6467
fedora*|redhat*|centos*)
6568
cat <<EOF

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=fee64e7ae45bcfd9bfa1c55605a579f49b19057e
3-
md5=42d9e4a2308a8c01f4e68f3915c3b856
4-
cksum=3408158874
2+
sha1=b6a462ba966439bb0cbd460d2bd1cb02d3343fba
3+
md5=95d6ce767184d6ee956feaf65494b4e8
4+
cksum=2637324690
+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
b95c1659af1d26926ddf421d28b2d1f76dbc4810
1+
b466c8ae02c04d287d28d2d669e1d111df3724ff

build/pkgs/gcc/spkg-configure.m4

+3-7
Original file line numberDiff line numberDiff line change
@@ -161,20 +161,16 @@ SAGE_SPKG_CONFIGURE_BASE([gcc], [
161161
# Add the .0 because Debian/Ubuntu gives version numbers like
162162
# 4.6 instead of 4.6.4 (Trac #18885)
163163
AS_CASE(["$GXX_VERSION.0"],
164-
[[[0-3]].*|4.[[0-7]].*|4.9.*], [
165-
# Install our own GCC if the system-provided one is older than gcc-4.8 or is 4.9.x
164+
[[[0-5]].*|6.[[0-2]].*], [
165+
# Install our own GCC if the system-provided one is older than gcc-6.3
166166
SAGE_SHOULD_INSTALL_GCC([you have $CXX version $GXX_VERSION, which is quite old])
167167
],
168168
[1[[3-9]].*], [
169169
# Install our own GCC if the system-provided one is newer than 12.x.
170170
# See https://trac.sagemath.org/ticket/29456
171171
SAGE_SHOULD_INSTALL_GCC([$CXX is g++ version $GXX_VERSION, which is too recent for this version of Sage])
172-
],
173-
[4.[[8-9]].*|5.[[0-1]].*], [
174-
# GCC less than 5.1 is not ready for AVX512.
175-
sage_use_march_native=no
176172
])
177-
fi
173+
fi
178174
179175
# The following tests check that the version of the compilers
180176
# are all the same.
+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tarball=memory_allocator-VERSION.tar.gz
2-
sha1=7721219be84207f6112e118fc79af0c2729fca34
3-
md5=868753a09c44194cba303db89cca4396
4-
cksum=16627262
2+
sha1=1a874de2674a1948797de109adfd1f56193e153a
3+
md5=c3a5d0f5acf896eec84266964a8aec0e
4+
cksum=3431157422
55
upstream_url=https://pypi.io/packages/source/m/memory_allocator/memory_allocator-VERSION.tar.gz
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.1.1
1+
0.1.3

build/pkgs/sage_setup/dependencies

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
$(PYTHON) cython pkgconfig $(SAGE_ROOT)/pkgs/sage-setup/sage_setup/autogen/interpreters/specs/*.py $(SAGE_ROOT)/pkgs/sage-setup/sage_setup/command/*.py | $(PYTHON_TOOLCHAIN)
1+
$(PYTHON) cython pkgconfig jinja2 $(SAGE_ROOT)/pkgs/sage-setup/sage_setup/autogen/interpreters/specs/*.py $(SAGE_ROOT)/pkgs/sage-setup/sage_setup/command/*.py | $(PYTHON_TOOLCHAIN)
22

33
----------
44
All lines of this file are ignored except the first.

build/pkgs/singular/spkg-configure.m4

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ SAGE_SPKG_CONFIGURE([singular], [
4848
], [
4949
AC_MSG_RESULT(no)
5050
sage_spkg_install_singular=yes
51-
])
52-
])
51+
], [AC_MSG_RESULT(yes)])
52+
], [AC_MSG_RESULT(yes)])
5353
5454
AC_LANG_POP()
5555
LIBS="${ORIG_LIBS}"

pkgs/sage-conf/VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
9.7.beta2
1+
9.7.beta3

pkgs/sage-conf_pypi/VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
9.7.beta2
1+
9.7.beta3

pkgs/sage-docbuild/VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
9.7.beta2
1+
9.7.beta3

pkgs/sage-setup/VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
9.7.beta2
1+
9.7.beta3

pkgs/sage-setup/requirements.txt

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
Cython
22
pkgconfig
3+
jinja2

pkgs/sage-setup/setup.cfg

+1
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,4 @@ python_requires = >=3.8, <3.11
3535

3636
install_requires =
3737
pkgconfig
38+
jinja2

pkgs/sage-sws2rst/VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
9.7.beta2
1+
9.7.beta3

pkgs/sagemath-categories/VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
9.7.beta2
1+
9.7.beta3

pkgs/sagemath-environment/VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
9.7.beta2
1+
9.7.beta3

pkgs/sagemath-objects/VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
9.7.beta2
1+
9.7.beta3

pkgs/sagemath-repl/VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
9.7.beta2
1+
9.7.beta3

src/VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
9.7.beta2
1+
9.7.beta3

src/bin/sage-preparse

+1-2
Original file line numberDiff line numberDiff line change
@@ -278,8 +278,7 @@ def do_load_and_attach(G, file, files_before):
278278
files = z.group('files').split()
279279
lws = z.group('lws')
280280
for w in files:
281-
name = w.replace(',','').replace('"','').replace("'","")
282-
#print "'%s'"%name, files_before
281+
name = w.replace(',', '').replace('"', '').replace("'", "")
283282
if name in files_before:
284283
print("WARNING: not loading {} (in {}) again since would cause circular loop"
285284
.format(name, file))

src/bin/sage-runtests

+6-4
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,15 @@ if __name__ == "__main__":
4343
# By default, include all tests marked 'sagemath_doc_html' -- see
4444
# https://trac.sagemath.org/ticket/25345 and
4545
# https://trac.sagemath.org/ticket/26110:
46-
parser.add_argument("--optional", metavar="PKGS", default=_get_optional_defaults(),
47-
help='only run tests including one of the "# optional" tags listed in PKGS; '
46+
parser.add_argument("--optional", metavar="FEATURES", default=_get_optional_defaults(),
47+
help='only run tests including one of the "# optional" tags listed in FEATURES (separated by commas); '
4848
'if "sage" is listed, will also run the standard doctests; '
4949
'if "sagemath_doc_html" is listed, will also run the tests relying on the HTML documentation; '
50-
'if "optional" is listed, will also run tests for installed optional (new-style) packages; '
50+
'if "optional" is listed, will also run tests for installed optional packages or detected features; '
5151
'if "external" is listed, will also run tests for available external software; '
52-
'if set to "all", then all tests will be run')
52+
'if set to "all", then all tests will be run; '
53+
'use "!FEATURE" to disable tests marked "# optional - FEATURE". '
54+
'Note that "!" needs to be quoted or escaped in the shell.')
5355
parser.add_argument("--randorder", type=int, metavar="SEED", help="randomize order of tests")
5456
parser.add_argument("--random-seed", dest="random_seed", type=int, metavar="SEED", help="random seed (integer) for fuzzing doctests",
5557
default=os.environ.get("SAGE_DOCTEST_RANDOM_SEED"))

src/bin/sage-version.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Sage version information for shell scripts
22
# This file is auto-generated by the sage-update-version script, do not edit!
3-
SAGE_VERSION='9.7.beta2'
4-
SAGE_RELEASE_DATE='2022-06-12'
5-
SAGE_VERSION_BANNER='SageMath version 9.7.beta2, Release Date: 2022-06-12'
3+
SAGE_VERSION='9.7.beta3'
4+
SAGE_RELEASE_DATE='2022-06-19'
5+
SAGE_VERSION_BANNER='SageMath version 9.7.beta3, Release Date: 2022-06-19'

src/doc/en/developer/coding_basics.rst

+3-4

src/doc/en/installation/source.rst

+2-5

src/doc/en/reference/combinat/module_list.rst

+2

src/doc/en/reference/references/index.rst

+7

src/doc/en/website/templates/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ <h1>{{ docstitle|e }}</h1>
3333
<p>
3434
This is documentation for Sage {{ release }}.
3535
Documentations in other languages are available <a href="../../index.html">here</a>.
36-
</p>.
36+
</p>
3737
{% block tables %}
3838
<h2>
3939
<strong>

src/sage/algebras/askey_wilson.py

+2
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,7 @@ def _latex_term(self, t):
300300
"""
301301
if sum(t) == 0:
302302
return '1'
303+
303304
def exp(l, e):
304305
if e == 0:
305306
return ''
@@ -338,6 +339,7 @@ def algebra_generators(self):
338339
[A, B, C, a, b, g]
339340
"""
340341
A = self.variable_names()
342+
341343
def build_monomial(g):
342344
exp = [0] * 6
343345
exp[A.index(g)] = 1

src/sage/algebras/clifford_algebra.py

+1
Original file line numberDiff line numberDiff line change
@@ -1963,6 +1963,7 @@ def lifted_bilinear_form(self, M):
19631963
back are implemented, check if this is faster.
19641964
"""
19651965
R = self.base_ring()
1966+
19661967
def lifted_form(x, y):
19671968
result = R.zero()
19681969
for mx, cx in x:

src/sage/algebras/commutative_dga.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -2281,7 +2281,7 @@ def cohomology_generators(self, max_degree):
22812281
22822282
ALGORITHM:
22832283
2284-
Reduce a basis of the `n`'th cohomology modulo all the degree $n$
2284+
Reduce a basis of the `n`'th cohomology modulo all the degree `n`
22852285
products of the lower degree cohomologies.
22862286
22872287
EXAMPLES::
@@ -2292,12 +2292,12 @@ def cohomology_generators(self, max_degree):
22922292
{1: [a], 2: [x], 3: [a*y]}
22932293
22942294
The previous example has infinitely generated cohomology:
2295-
$a y^n$ is a cohomology generator for each $n$::
2295+
`a y^n` is a cohomology generator for each `n`::
22962296
22972297
sage: B.cohomology_generators(10)
22982298
{1: [a], 2: [x], 3: [a*y], 5: [a*y^2], 7: [a*y^3], 9: [a*y^4]}
22992299
2300-
In contrast, the corresponding algebra in characteristic $p$
2300+
In contrast, the corresponding algebra in characteristic `p`
23012301
has finitely generated cohomology::
23022302
23032303
sage: A3.<a,x,y> = GradedCommutativeAlgebra(GF(3), degrees=(1,2,2))

src/sage/algebras/free_algebra.py

+1
Original file line numberDiff line numberDiff line change
@@ -591,6 +591,7 @@ def _element_constructor_(self, x):
591591
if self.has_coerce_map_from(P): # letterplace versus generic
592592
ngens = P.ngens()
593593
M = self._indices
594+
594595
def exp_to_monomial(T):
595596
out = []
596597
for i in range(len(T)):

src/sage/algebras/free_algebra_element.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,8 @@ def __call__(self, *x, **kwds):
150150

151151
if kwds:
152152
p = self.parent()
153-
def extract_from(kwds,g):
153+
154+
def extract_from(kwds, g):
154155
for x in g:
155156
try:
156157
return kwds[x]

src/sage/algebras/hecke_algebras/ariki_koike_algebra.py

+2
Original file line numberDiff line numberDiff line change
@@ -1688,6 +1688,7 @@ def _product_TT(self, kp, a, k, b):
16881688
T[kp] = a + b
16891689
return self._from_dict({(tuple(T), self._one_perm): one},
16901690
remove_zeros=False, coerce=False)
1691+
16911692
def key(exp):
16921693
if exp > 0 or kp == 0:
16931694
T = list(self._zero_tuple)
@@ -1715,6 +1716,7 @@ def key(exp):
17151716
T[kp] = a
17161717
ret = {(tuple(T), s1): one}
17171718
zero = self.base_ring().zero()
1719+
17181720
def T_index(exp, ind, i, indp):
17191721
T = list(self._zero_tuple)
17201722
T[ind] = exp

0 commit comments

Comments
 (0)