Skip to content

Commit cebcda3

Browse files
author
Matthias Koeppe
committed
Merge tag '9.5.beta4' into t/29039/pip_installable_package_sage_bootstrap
SageMath version 9.5.beta4, Release Date: 2021-10-19
2 parents c695921 + 056b8d4 commit cebcda3

File tree

1,171 files changed

+16399
-13729
lines changed

Some content is hidden

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

1,171 files changed

+16399
-13729
lines changed

‎.github/workflows/ci-cygwin-minimal.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484
cygwin-stage-i-b:
8585
env:
8686
STAGE: i-b
87-
TARGETS: cython setuptools_scm kiwisolver dateutil cycler pyparsing nose certifi pkgconfig pplpy
87+
TARGETS: cython setuptools_scm kiwisolver dateutil cycler pyparsing certifi pkgconfig pplpy
8888
LOCAL_ARTIFACT_NAME: sage-local-commit-${{ github.sha }}-cygwin-${{ matrix.pkgs }}
8989
LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-cygwin-${{ matrix.pkgs }}
9090

‎.github/workflows/ci-cygwin-standard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484
cygwin-stage-i-b:
8585
env:
8686
STAGE: i-b
87-
TARGETS: cython setuptools_scm kiwisolver dateutil cycler pyparsing nose certifi pkgconfig pplpy
87+
TARGETS: cython setuptools_scm kiwisolver dateutil cycler pyparsing certifi pkgconfig pplpy
8888
LOCAL_ARTIFACT_NAME: sage-local-commit-${{ github.sha }}-cygwin-${{ matrix.pkgs }}
8989
LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-cygwin-${{ matrix.pkgs }}
9090

‎.github/workflows/tox-experimental.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,17 @@ jobs:
4040
matrix:
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
43-
tox_system_factor: [ubuntu-trusty-gcc_spkg, ubuntu-xenial, ubuntu-bionic, ubuntu-focal, ubuntu-groovy, ubuntu-hirsute, debian-jessie-gcc_spkg, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-17-gcc_spkg, 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-gcc_spkg]
43+
# 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]
4445
tox_packages_factor: [maximal]
4546
targets_pattern: [0-g, h-o, p, q-z]
4647
env:
4748
TOX_ENV: docker-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
4849
LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-docker-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
4950
DOCKER_TARGETS: configured with-targets with-targets-optional
50-
TARGETS_OPTIONAL: "$( echo $(PATH=build/bin:$PATH build/bin/sage-package list :experimental: | grep -v database_stein_watkins\\$ | grep -v polytopes_db_4d | grep '^[${{ matrix.targets_pattern }}]' ) )"
51+
# Test all non-dummy experimental packages, but do not test huge packages
52+
# and do not test packages that require external software
53+
TARGETS_OPTIONAL: "$( echo $(export PATH=build/bin:$PATH && sage-package list :experimental: --has-file spkg-install.in && sage-package list :experimental: --has-file spkg-install && sage-package list :experimental: --has-file requirements.txt | grep -v ^_ | grep -v database_stein_watkins\\$ | grep -v polytopes_db_4d | grep -v cplex | grep -v gurobi | grep '^[${{ matrix.targets_pattern }}]' ) )"
5154
steps:
5255
- uses: actions/checkout@v2
5356
with:
@@ -146,7 +149,9 @@ jobs:
146149
env:
147150
TOX_ENV: local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
148151
LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}-${{ matrix.os }}-xcode_${{ matrix.xcode_version_factor }}
149-
TARGETS_OPTIONAL: "$( echo $(PATH=build/bin:$PATH build/bin/sage-package list :experimental: | grep -v database_stein_watkins\\$ | grep -v polytopes_db_4d | grep '^[${{ matrix.targets_pattern }}]' ) )"
152+
# Test all non-dummy experimental packages, but do not test huge packages
153+
# and do not test packages that require external software
154+
TARGETS_OPTIONAL: "$( echo $(export PATH=build/bin:$PATH && sage-package list :experimental: --has-file spkg-install.in && sage-package list :experimental: --has-file spkg-install && sage-package list :experimental: --has-file requirements.txt | grep -v ^_ | grep -v database_stein_watkins\\$ | grep -v polytopes_db_4d | grep -v cplex | grep -v gurobi | grep '^[${{ matrix.targets_pattern }}]' ) )"
150155
steps:
151156
- uses: actions/checkout@v2
152157
- name: Select Xcode version

‎.github/workflows/tox-optional.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,17 @@ jobs:
4040
matrix:
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
43-
tox_system_factor: [ubuntu-trusty-gcc_spkg, ubuntu-xenial, ubuntu-bionic, ubuntu-focal, ubuntu-groovy, ubuntu-hirsute, debian-jessie-gcc_spkg, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-17-gcc_spkg, 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-gcc_spkg]
43+
# 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]
4445
tox_packages_factor: [maximal]
4546
targets_pattern: [0-g, h-o, p, q-z]
4647
env:
4748
TOX_ENV: docker-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
4849
LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-docker-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
4950
DOCKER_TARGETS: configured with-targets with-targets-optional
50-
# Test all optional packages, but do not test huge packages,
51+
# Test all non-dummy optional packages, but do not test huge packages
5152
# and do not test packages that require external software
52-
TARGETS_OPTIONAL: "$( echo $(PATH=build/bin:$PATH build/bin/sage-package list :optional: | grep -v database_stein_watkins\\$ | grep -v polytopes_db_4d | grep -v cplex | grep -v gurobi | grep '^[${{ matrix.targets_pattern }}]' ) )"
53+
TARGETS_OPTIONAL: "$( echo $(export PATH=build/bin:$PATH && (sage-package list :optional: --has-file spkg-install.in && sage-package list :optional: --has-file spkg-install && sage-package list :optional: --has-file requirements.txt) | grep -v ^_ | grep -v database_stein_watkins\\$ | grep -v polytopes_db_4d | grep -v cplex | grep -v gurobi | grep '^[${{ matrix.targets_pattern }}]' ) )"
5354
steps:
5455
- uses: actions/checkout@v2
5556
with:
@@ -148,9 +149,9 @@ jobs:
148149
env:
149150
TOX_ENV: local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
150151
LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}-${{ matrix.os }}-xcode_${{ matrix.xcode_version_factor }}
151-
# Test all optional packages, but do not test huge packages
152+
# Test all non-dummy optional packages, but do not test huge packages
152153
# and do not test packages that require external software
153-
TARGETS_OPTIONAL: "$( echo $(PATH=build/bin:$PATH build/bin/sage-package list :optional: | grep -v database_stein_watkins\\$ | grep -v polytopes_db_4d | grep -v cplex | grep -v gurobi | grep '^[${{ matrix.targets_pattern }}]' ) )"
154+
TARGETS_OPTIONAL: "$( echo $(export PATH=build/bin:$PATH && (sage-package list :optional: --has-file spkg-install.in && sage-package list :optional: --has-file spkg-install && sage-package list :optional: --has-file requirements.txt) | grep -v ^_ | grep -v database_stein_watkins\\$ | grep -v polytopes_db_4d | grep -v cplex | grep -v gurobi | grep '^[${{ matrix.targets_pattern }}]' ) )"
154155
steps:
155156
- uses: actions/checkout@v2
156157
- name: Select Xcode version

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ src/*.egg-info/
182182
/src/bin/sage-src-env-config
183183

184184
# Virtual environments
185+
/venv
185186
src/.env
186187
src/.venv
187188
src/env/

‎.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.beta2",
5-
"version": "9.5.beta2",
4+
"title": "sagemath/sage: 9.5.beta4",
5+
"version": "9.5.beta4",
66
"upload_type": "software",
7-
"publication_date": "2021-09-26",
7+
"publication_date": "2021-10-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.5.beta2",
18+
"identifier": "https://github.com/sagemath/sage/tree/9.5.beta4",
1919
"relation": "isSupplementTo"
2020
},
2121
{

‎COPYING.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ the licenses of the components of Sage are included below as well.
3232
SOFTWARE LICENSE
3333
-----------------------------------------------------------------------
3434
arb GPLv2+
35-
atlas Modified BSD
3635
boehm_gc MIT-like license (see below)
3736
backports_ssl_match_hostname Python License
3837
boost_cropped Boost Software License (see below)
@@ -86,7 +85,6 @@ mistune Modified BSD
8685
mpc LGPLv3+
8786
mpfi COPYING is GPLv2, source files state LGPLv2.1+
8887
mpfr LGPLv3+
89-
mpir LGPLv3+
9088
mpmath Modified BSD
9189
networkx Modified BSD
9290
ntl GPLv2+

‎Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ distclean: build-clean
118118
@echo "Deleting all remaining output from build system ..."
119119
rm -rf local
120120
rm -f src/bin/sage-env-config
121+
rm -f prefix venv
121122

122123
# Delete all auto-generated files which are distributed as part of the
123124
# source tarball

‎README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ Simplified directory layout (only essential files/directories):
349349
SAGE_ROOT Root directory (sage-x.y.z in Sage tarball)
350350
├── build
351351
│ └── pkgs Every package is a subdirectory here
352-
│ ├── atlas
352+
│ ├── 4ti2
353353
│ …
354354
│ └── zn_poly
355355
├── configure Top-level configure script
@@ -381,9 +381,9 @@ SAGE_ROOT Root directory (sage-x.y.z in Sage tarball)
381381
│ ├── dochtml.log Log of the documentation build
382382
│ ├── install.log Full install log
383383
│ └── pkgs Build logs of individual packages
384-
│ ├── atlas-3.10.1.p7.log
384+
│ ├── alabaster-0.7.12.log
385385
│ …
386-
│ └── zn_poly-0.9.p11.log
386+
│ └── zn_poly-0.9.2.log
387387
├── m4 M4 macros for configure
388388
│ └── *.m4
389389
├── Makefile Running "make" uses this file
@@ -394,9 +394,9 @@ SAGE_ROOT Root directory (sage-x.y.z in Sage tarball)
394394
│ ├── doc Sage documentation sources
395395
│ └── sage The Sage library source code
396396
├── upstream Source tarballs of packages
397-
│ ├── atlas-3.10.1.tar.bz2
397+
│ ├── Babel-2.9.1.tar.gz
398398
│ …
399-
│ └── zn_poly-0.9.tar.bz2
399+
│ └── zn_poly-0.9.2.tar.gz
400400
└── VERSION.txt
401401
```
402402
For more details see [our Developer's Guide](https://doc.sagemath.org/html/en/developer/coding_basics.html#files-and-directory-structure).

‎VERSION.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SageMath version 9.5.beta2, Release Date: 2021-09-26
1+
SageMath version 9.5.beta4, Release Date: 2021-10-19

0 commit comments

Comments
 (0)