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

Commit 42606e3

Browse files
dkrenndkrenn
committed
Merge tag '9.3' into t/21295/sequences/recognizable
SageMath version 9.3, Release Date: 2021-05-09 * tag '9.3': (51 commits) Updated SageMath version to 9.3 build/pkgs/fplll/spkg-install.in: Configure --without-qd if we use gcc from spkg build/pkgs/fplll/spkg-configure.m4: Add depcheck on gcc build/pkgs/ppl/spkg-configure.m4: Add depcheck on gcc build/pkgs/brial/spkg-configure.m4: Add depcheck on gcc build/pkgs/{freetype,libgd}/spkg-configure.m4: Add depcheck for gcc build/pkgs/zeromq/spkg-configure.m4: Add depcheck for gcc build/pkgs/ntl/spkg-configure.m4: Add depcheck for gcc Updated SageMath version to 9.3.rc5 #31628: two doctests Trac #25034: move reference to master bib Trac #25034: formatting + typos Trac #25034: eval_poly deprecation + doc improved increment pynac patch level again add doctest trac 31645 handling of constant term in series fix doctest for 32-bit Updated SageMath version to 9.3.rc4 Trac #25034: add abs tol Trac #25034: wrong indent in docstring ...
2 parents 13ad4a1 + d6c5cd9 commit 42606e3

Some content is hidden

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

49 files changed

+648
-237
lines changed

‎.github/workflows/tox-experimental.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: 6
4040
matrix:
41-
tox_system_factor: [ubuntu-trusty, ubuntu-xenial, ubuntu-bionic, ubuntu-focal, ubuntu-groovy, ubuntu-hirsute, debian-jessie, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-17, 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, centos-8, gentoo, archlinux-latest, slackware-14.2, conda-forge, ubuntu-bionic-i386, ubuntu-focal-i386, debian-buster-i386, centos-7-i386]
41+
tox_system_factor: [ubuntu-trusty, ubuntu-xenial, ubuntu-bionic, ubuntu-focal, ubuntu-groovy, ubuntu-hirsute, debian-jessie, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-17, 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, centos-8, gentoo, archlinux-latest, slackware-14.2, conda-forge, ubuntu-bionic-i386, manylinux-2_24-i686, debian-buster-i386, centos-7-i386]
4242
tox_packages_factor: [maximal]
4343
targets_pattern: [0-g, h-o, p, q-z]
4444
env:

‎.github/workflows/tox-optional.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: 6
4040
matrix:
41-
tox_system_factor: [ubuntu-trusty, ubuntu-xenial, ubuntu-bionic, ubuntu-focal, ubuntu-groovy, ubuntu-hirsute, debian-jessie, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-17, 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, centos-8, gentoo, archlinux-latest, slackware-14.2, conda-forge, ubuntu-bionic-i386, ubuntu-focal-i386, debian-buster-i386, centos-7-i386]
41+
tox_system_factor: [ubuntu-trusty, ubuntu-xenial, ubuntu-bionic, ubuntu-focal, ubuntu-groovy, ubuntu-hirsute, debian-jessie, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-17, 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, centos-8, gentoo, archlinux-latest, slackware-14.2, conda-forge, ubuntu-bionic-i386, manylinux-2_24-i686, debian-buster-i386, centos-7-i386]
4242
tox_packages_factor: [maximal]
4343
targets_pattern: [0-g, h-o, p, q-z]
4444
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, debian-jessie, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-17, 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, centos-8, gentoo, gentoo-python3.7, archlinux-latest, slackware-14.2, conda-forge, ubuntu-bionic-i386, ubuntu-focal-i386, debian-buster-i386, centos-7-i386]
41+
tox_system_factor: [ubuntu-trusty, ubuntu-xenial, ubuntu-bionic, ubuntu-focal, ubuntu-groovy, ubuntu-hirsute, debian-jessie, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-17, 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, centos-8, gentoo, gentoo-python3.7, archlinux-latest, 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.3.rc3",
5-
"version": "9.3.rc3",
4+
"title": "sagemath/sage: 9.3",
5+
"version": "9.3",
66
"upload_type": "software",
7-
"publication_date": "2021-04-12",
7+
"publication_date": "2021-05-09",
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.rc3",
18+
"identifier": "https://github.com/sagemath/sage/tree/9.3",
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.3.rc3, Release Date: 2021-04-12
1+
SageMath version 9.3, Release Date: 2021-05-09

‎build/pkgs/brial/spkg-configure.m4‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
SAGE_SPKG_CONFIGURE([brial], [
2-
SAGE_SPKG_DEPCHECK([boost m4ri], [
2+
dnl Trac #31624: Avoid C++ ABI issues
3+
SAGE_SPKG_DEPCHECK([gcc boost m4ri], [
34
# If we're using the system m4ri and boost, ensure that we can
45
# compile and run an executable linked against both libbrial and
56
# libbrial_groebner (both are used by SageMath).

‎build/pkgs/configure/checksums.ini‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=configure-VERSION.tar.gz
2-
sha1=8e87b8d927704c25058ba2d9595e48e22062197f
3-
md5=ebdea78d9fb120ab8e31f4ea5dd01d8e
4-
cksum=3284139585
2+
sha1=2d5d2d8a2a6dbc721935f6b3d3ada9a6bd977e19
3+
md5=d84b8fcb2ddd6949d3461f49fae01702
4+
cksum=2508666370

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
c0dc957ff06d230f943cad6ae12dc3b028eec49c
1+
3f4547f2cc40338ba42329d53f7fb48c31ff9fc8

‎build/pkgs/fplll/spkg-configure.m4‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
SAGE_SPKG_CONFIGURE([fplll], [
2-
SAGE_SPKG_DEPCHECK([mpfr], [
2+
SAGE_SPKG_DEPCHECK([gcc mpfr], [
33
dnl If we're using the system mpfr, use pkgconfig to determine
44
dnl if there's a usable system copy of fplll. Unless there's
55
dnl a system that ships fplll without fplll.pc file, falling

‎build/pkgs/fplll/spkg-install.in‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@ if [ "x$SAGE_DEBUG" = "xyes" ]; then
2020
CONFIGUREFLAGS="$CONFIGUREFLAGS --enable-debug"
2121
fi
2222

23+
if [ -x "$SAGE_LOCAL"/bin/gcc ]; then
24+
# Trac #31624: Avoid C++ ABI issues
25+
CONFIGUREFLAGS="$CONFIGUREFLAGS --without-qd"
26+
fi
27+
2328
export CXXFLAGS="$CXXFLAGS"
2429
export CPPFLAGS="$CPPFLAGS"
2530
export CXX="$CXX"

0 commit comments

Comments
 (0)