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

Commit 38e210e

Browse files
tobiasdieztobiasdiez
committed
Merge branch 'develop' of git://github.com/sagemath/sage into public/build/pytest_config
2 parents bf014ba + 9d686f2 commit 38e210e

File tree

219 files changed

+3899
-1804
lines changed

Some content is hidden

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

219 files changed

+3899
-1804
lines changed

‎.github/workflows/tox-experimental.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
fail-fast: false
3737
max-parallel: 6
3838
matrix:
39-
tox_system_factor: [ubuntu-trusty, ubuntu-xenial, ubuntu-bionic, ubuntu-eoan, 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]
39+
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]
4040
tox_packages_factor: [maximal]
4141
targets_pattern: [0-g, h-o, p, q-z]
4242
env:

‎.github/workflows/tox-optional.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
fail-fast: false
3737
max-parallel: 6
3838
matrix:
39-
tox_system_factor: [ubuntu-trusty, ubuntu-xenial, ubuntu-bionic, ubuntu-eoan, 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]
39+
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]
4040
tox_packages_factor: [maximal]
4141
targets_pattern: [0-g, h-o, p, q-z]
4242
env:

‎.github/workflows/tox.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
fail-fast: false
3737
max-parallel: 20
3838
matrix:
39-
tox_system_factor: [ubuntu-trusty, ubuntu-xenial, ubuntu-bionic, ubuntu-eoan, 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]
39+
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]
4040
tox_packages_factor: [minimal, standard]
4141
env:
4242
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.beta4",
5-
"version": "9.3.beta4",
4+
"title": "sagemath/sage: 9.3.beta5",
5+
"version": "9.3.beta5",
66
"upload_type": "software",
7-
"publication_date": "2020-12-14",
7+
"publication_date": "2020-12-27",
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.beta4",
18+
"identifier": "https://github.com/sagemath/sage/tree/9.3.beta5",
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.beta4, Release Date: 2020-12-14
1+
SageMath version 9.3.beta5, Release Date: 2020-12-27

‎build/bin/sage-build-env‎

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,44 +49,60 @@ fi
4949
if [ "x$ORIGINAL_CFLAGS" == "x" ]; then
5050
# Evaluate SAGE_DEBUG:
5151
if [ "x$SAGE_DEBUG" == "xyes" ]; then
52-
export CFLAGS="-Og -g"
53-
export CFLAGS_O3="-Og -g"
52+
export CFLAGS_NON_NATIVE="-Og -g"
53+
export CFLAGS_O3_NON_NATIVE="-Og -g"
5454
elif [ "x$SAGE_DEBUG" == "xno" ]; then
55-
export CFLAGS="-O2"
56-
export CFLAGS_O3="-O3"
55+
export CFLAGS_NON_NATIVE="-O2"
56+
export CFLAGS_O3_NON_NATIVE="-O3"
5757
else
58-
export CFLAGS="-O2 -g"
59-
export CFLAGS_O3="-O3 -g"
58+
export CFLAGS_NON_NATIVE="-O2 -g"
59+
export CFLAGS_O3_NON_NATIVE="-O3 -g"
6060
fi
61+
export CFLAGS="$CFLAGS_NON_NATIVE $CFLAGS_MARCH"
62+
export CFLAGS_O3="$CFLAGS_O3_NON_NATIVE $CFLAGS_MARCH"
6163
else
6264
# Respect user environment variable.
6365
export CFLAGS="$ORIGINAL_CFLAGS"
6466
export CFLAGS_O3="$ORIGINAL_CFLAGS"
67+
export CFLAGS_NON_NATIVE="$ORIGINAL_CFLAGS"
68+
export CFLAGS_O3_NON_NATIVE="$ORIGINAL_CFLAGS"
6569
fi
6670

6771
# Copy to CXXFLAGS if this is not set.
6872
if [ "x$ORIGINAL_CXXFLAGS" == "x" ]; then
6973
export CXXFLAGS="$CFLAGS"
7074
export CXXFLAGS_O3="$CFLAGS_O3"
75+
export CXXFLAGS_NON_NATIVE="$CFLAGS_NON_NATIVE"
76+
export CXXFLAGS_O3_NON_NATIVE="$CFLAGS_O3_NON_NATIVE"
7177
else
7278
export CXXFLAGS="$ORIGINAL_CXXFLAGS"
7379
export CXXFLAGS_O3="$ORIGINAL_CXXFLAGS"
80+
export CXXFLAGS_NON_NATIVE="$ORIGINAL_CXXFLAGS"
81+
export CXXFLAGS_O3_NON_NATIVE="$ORIGINAL_CXXFLAGS"
7482
fi
7583

7684
# Copy CFLAGS to FCFLAGS if this is not set.
7785
if [ "x$ORIGINAL_FCFLAGS" == "x" ]; then
7886
export FCFLAGS="$CFLAGS"
7987
export FCFLAGS_O3="$CFLAGS_O3"
88+
export FCFLAGS_NON_NATIVE="$CFLAGS_NON_NATIVE"
89+
export FCFLAGS_O3_NON_NATIVE="$CFLAGS_O3_NON_NATIVE"
8090
else
8191
export FCFLAGS="$ORIGINAL_FCFLAGS"
8292
export FCFLAGS_O3="$ORIGINAL_FCFLAGS"
93+
export FCFLAGS_NON_NATIVE="$ORIGINAL_FCFLAGS"
94+
export FCFLAGS_O3_NON_NATIVE="$ORIGINAL_FCFLAGS"
8395
fi
8496

8597
# Copy FCFLAGS to F77FLAGS if this is not set.
8698
if [ "x$ORIGINAL_F77FLAGS" == "x" ]; then
8799
export F77FLAGS="$FCFLAGS"
88100
export F77FLAGS_O3="$FCFLAGS_O3"
101+
export F77FLAGS_NON_NATIVE="$FCFLAGS_NON_NATIVE"
102+
export F77FLAGS_O3_NON_NATIVE="$FCFLAGS_O3_NON_NATIVE"
89103
else
90104
export F77FLAGS="$ORIGINAL_F77FLAGS"
91105
export F77FLAGS_O3="$ORIGINAL_F77FLAGS"
106+
export F77FLAGS_NON_NATIVE="$ORIGINAL_F77FLAGS"
107+
export F77FLAGS_O3_NON_NATIVE="$ORIGINAL_F77FLAGS"
92108
fi

‎build/bin/sage-build-env-config.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ export CONFIGURED_CFLAGS="@CFLAGS@"
3636
export CONFIGURED_CXXFLAGS="@CXXFLAGS@"
3737
export CONFIGURED_FCFLAGS="@FCFLAGS@"
3838
export CONFIGURED_F77FLAGS="@F77FLAGS@"
39+
export CFLAGS_MARCH="@CFLAGS_MARCH@"
3940

4041
# This is usually blank if the system GMP is used, or $SAGE_LOCAL otherwise
4142
export SAGE_GMP_PREFIX="@SAGE_GMP_PREFIX@"

‎build/bin/sage-site‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -128,16 +128,6 @@ if [ "$1" = '-standard' -o "$1" = "--standard" ]; then
128128
exec sage-list-packages standard $@
129129
fi
130130

131-
if [ "$1" = '-installed' -o "$1" = "--installed" ]; then
132-
shift
133-
exec sage-list-packages all --installed-only $@
134-
fi
135-
136-
if [ "$1" = '-p' ]; then
137-
echo "Error: Installing old-style SPKGs is no longer supported."
138-
exit 1
139-
fi
140-
141131
if [ "$1" = '-info' -o "$1" = '--info' ]; then
142132
shift
143133
for PKG in "$@"

‎build/pkgs/_recommended/distros/debian.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ texlive-xetex
77
# to generate pdf documentation
88
latexmk
99
# to convert Jupyter notebooks to pdf
10-
pandoc
10+
# pandoc -- this is a separate script package
1111
# to render text with LaTeX in Matplotlib
1212
dvipng
1313
# to run the Jmol 3D viewer from the console and generate images for 3D plots in the documentation

‎build/pkgs/_recommended/distros/homebrew.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# To convert Jupyter notebooks to pdf:
2-
pandoc
2+
# pandoc -- this is a separate script package
33
# To produce animations:
44
ffmpeg
55
imagemagick

0 commit comments

Comments
 (0)