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

Commit 4558791

Browse files
author
Matthias Koeppe
committed
Merge tag '9.5.beta3' into t/32614/features_and_optional_tags_for_sage_subset_distributions
SageMath version 9.5.beta3, Release Date: 2021-10-11
2 parents f63a7d0 + c896669 commit 4558791

File tree

695 files changed

+10135
-8330
lines changed

Some content is hidden

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

695 files changed

+10135
-8330
lines changed

.github/workflows/tox-experimental.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ 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:

.github/workflows/tox-optional.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ 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:

.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.beta3",
5+
"version": "9.5.beta3",
66
"upload_type": "software",
7-
"publication_date": "2021-09-26",
7+
"publication_date": "2021-10-11",
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.beta3",
1919
"relation": "isSupplementTo"
2020
},
2121
{

COPYING.txt

Lines changed: 0 additions & 1 deletion
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)

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.beta3, Release Date: 2021-10-11

build/bin/sage-package

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
# $ sage-package list | sort
1717
# 4ti2
1818
# arb
19-
# atlas
2019
# autotools
2120
# [...]
2221
# zn_poly

build/make/Makefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ SPKG_INST_RELDIR = var/lib/sage/installed
3333
TOOLCHAIN = @SAGE_TOOLCHAIN@
3434
PYTHON = python3
3535
MP_LIBRARY = @SAGE_MP_LIBRARY@
36-
BLAS = @SAGE_BLAS@
36+
BLAS = openblas
3737

3838
# pkgconfig files generated/installed at build time
3939
PCFILES = @SAGE_SYSTEM_FACADE_PC_FILES@
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Packages needed for ./bootstrap
2-
gettext autoconf automake libtool pkg-config
2+
gettext autoconf automake libtool
33
gettext-devel
44
xtools mk-configure

build/pkgs/_prereq/distros/void.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ binutils
22
make
33
m4
44
perl
5+
pkg-config
56
python3
67
tar
78
bc

0 commit comments

Comments
 (0)