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

Commit 0d7946c

Browse files
author
Matthias Koeppe
committed
Merge tag '9.3.beta9' into t/31492/gh_actions__reduce_reorder_macos_tests
SageMath version 9.3.beta9, Release Date: 2021-03-14
2 parents 697448a + 5cb72aa commit 0d7946c

File tree

356 files changed

+6323
-8471
lines changed

Some content is hidden

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

356 files changed

+6323
-8471
lines changed

.github/workflows/tox.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ jobs:
240240
- name: Install bootstrap prerequisites
241241
run: |
242242
sudo DEBIAN_FRONTEND=noninteractive apt-get update
243-
sudo DEBIAN_FRONTEND=noninteractive apt-get install $(sed "s/#.*//;" build/pkgs/debian-bootstrap.txt)
243+
sudo DEBIAN_FRONTEND=noninteractive apt-get install $(build/bin/sage-get-system-packages debian _bootstrap)
244244
- name: Bootstrap with sage-update-version
245245
# We set SAGE_ROOT and SAGE_SRC by hand
246246
# because 'sage -sh' does not work with an unconfigured tree,

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ src/sage/modular/arithgroup/farey_symbol.h
118118
!src/sage/stats/distributions/dgs_bern.c
119119
!src/sage/stats/distributions/dgs_gauss_dp.c
120120
!src/sage/stats/distributions/dgs_gauss_mp.c
121+
/src/cython_debug
121122

122123
# Temporary build files
123124
build/temp.*/

.homebrew-build-env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export PKG_CONFIG_PATH
2323
LIBRARY_PATH="$HOMEBREW/lib$LIBRARY_PATH"
2424
[ -z "$CPATH" ] || CPATH=":${CPATH}"
2525
CPATH="$HOMEBREW/include$CPATH"
26-
for l in readline bzip2; do
26+
for l in readline bzip2 ntl; do
2727
if [ -d "$HOMEBREW/opt/$l/lib" ]; then
2828
LIBRARY_PATH="$HOMEBREW/opt/$l/lib:$LIBRARY_PATH"
2929
fi

.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.beta8",
5-
"version": "9.3.beta8",
4+
"title": "sagemath/sage: 9.3.beta9",
5+
"version": "9.3.beta9",
66
"upload_type": "software",
7-
"publication_date": "2021-03-07",
7+
"publication_date": "2021-03-14",
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.beta8",
18+
"identifier": "https://github.com/sagemath/sage/tree/9.3.beta9",
1919
"relation": "isSupplementTo"
2020
},
2121
{

COPYING.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@ symmetrica MIT-like License (see below)
130130
sympow Modified BSD
131131
sympy Modified BSD
132132
tachyon Modified BSD
133-
termcap GPLv2+
134133
threejs MIT License
135134
tornado Apache License
136135
zlib Custom (Modified BSD)

Makefile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,12 @@ all: base-toolchain
1515
build: base-toolchain
1616
$(MAKE) all-build
1717

18+
build-local: base-toolchain
19+
$(MAKE) all-build-local
20+
21+
build-venv: base-toolchain
22+
$(MAKE) all-build-venv
23+
1824
start: base-toolchain
1925
$(MAKE) build-start
2026

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -219,9 +219,9 @@ Guide](https://doc.sagemath.org/html/en/installation).
219219
* Build tools: GNU `make`, GNU `m4`, `perl` (including
220220
``ExtUtils::MakeMaker``), `ranlib`, `git`, `tar`, `bc`
221221

222-
* Any version of `python` (full installation including `urllib`),
223-
but ideally version 3.7.x or 3.8.x, which will avoid having to build Sage's
224-
own copy of Python 3.
222+
* Python 3.4 or later, or Python 2.7, a full installation including
223+
`urllib`; but ideally version 3.7.x, 3.8.x, or 3.9.x, which will
224+
avoid having to build Sage's own copy of Python 3.
225225

226226
We have collected lists of system packages that provide these build
227227
prerequisites. See [build/pkgs/arch.txt](build/pkgs/arch.txt),

VERSION.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SageMath version 9.3.beta8, Release Date: 2021-03-07
1+
SageMath version 9.3.beta9, Release Date: 2021-03-14

build/bin/sage-bootstrap-python

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ fi
1717
# So it needs to find a python that has the urllib module.
1818
# For example, on Debian buster, the python3-minimal package does NOT provide it.
1919
#
20+
# Also, Trac #20023 removed the vendored argparse library from sage_bootstrap,
21+
# so we test that python is new enough (>= 2.7) to run it.
22+
#
2023
# See https://trac.sagemath.org/ticket/29090
2124

2225
# Trac #29890: Our first choice is "python", not "python3". This is to avoid
@@ -41,7 +44,7 @@ PYTHONS="python python3 python3.8 python3.7 python2.7 python3.6 python2"
4144
for PY in $PYTHONS; do
4245
PYTHON="$(PATH="$SAGE_ORIG_PATH" command -v $PY)"
4346
if [ -n "$PYTHON" ]; then
44-
if "$PYTHON" -c "import urllib; from hashlib import sha1; from os import listdir; listdir(\"$(pwd)\");" 2>/dev/null; then
47+
if "$PYTHON" -c "import argparse; import urllib; from hashlib import sha1; from os import listdir; listdir(\"$(pwd)\");" 2>/dev/null; then
4548
exec "$PYTHON" "$@"
4649
fi
4750
fi

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,3 +106,5 @@ export SAGE_FREETYPE_PREFIX="@SAGE_FREETYPE_PREFIX@"
106106
export SAGE_SUITESPARSE_PREFIX="@SAGE_SUITESPARSE_PREFIX@"
107107

108108
export SAGE_CONFIGURE_FFLAS_FFPACK="@SAGE_CONFIGURE_FFLAS_FFPACK@"
109+
110+
export SAGE_EDITABLE="@SAGE_EDITABLE@"

0 commit comments

Comments
 (0)