Skip to content

Commit 2dd7cf5

Browse files
author
Matthias Koeppe
committed
Merge tag '9.5.beta9' into t/32759/__configure___disable_doc
SageMath version 9.5.beta9, Release Date: 2021-12-23
2 parents a7fa5aa + c5af195 commit 2dd7cf5

File tree

353 files changed

+8951
-6476
lines changed

Some content is hidden

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

353 files changed

+8951
-6476
lines changed

.github/workflows/tox-experimental.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
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
4343
# 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-python3.9, gentoo-python3.10, 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]
44+
tox_system_factor: [ubuntu-xenial, ubuntu-bionic, ubuntu-focal, ubuntu-groovy, ubuntu-hirsute, ubuntu-impish, ubunty-jammy, debian-stretch, debian-buster, debian-bullseye, debian-bookworm, debian-sid, linuxmint-18, linuxmint-19, linuxmint-19.3, linuxmint-20.1, linuxmint-20.2. linuxmint-20.3, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, fedora-35, fedora-36, centos-7-gcc_spkg, centos-8, gentoo-python3.9, gentoo-python3.10, 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]
4545
tox_packages_factor: [maximal]
4646
targets_pattern: [0-g, h-o, p, q-z]
4747
env:

.github/workflows/tox-gcc_spkg.yml

Lines changed: 0 additions & 142 deletions
This file was deleted.

.github/workflows/tox-optional.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
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
4343
# 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-python3.9, gentoo-python3.10, 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]
44+
tox_system_factor: [ubuntu-xenial, ubuntu-bionic, ubuntu-focal, ubuntu-groovy, ubuntu-hirsute, ubuntu-impish, ubunty-jammy, debian-stretch, debian-buster, debian-bullseye, debian-bookworm, debian-sid, linuxmint-18, linuxmint-19, linuxmint-19.3, linuxmint-20.1, linuxmint-20.2. linuxmint-20.3, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, fedora-35, fedora-36, centos-7-gcc_spkg, centos-8, gentoo-python3.9, gentoo-python3.10, 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]
4545
tox_packages_factor: [maximal]
4646
targets_pattern: [0-g, h-o, p, q-z]
4747
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, ubuntu-impish, debian-jessie, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-17, linuxmint-18, linuxmint-19, linuxmint-19.3, linuxmint-20.1, linuxmint-20.2, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, fedora-35, centos-7, centos-8, gentoo-python3.9, gentoo-python3.10, 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]
41+
tox_system_factor: [ubuntu-trusty, ubuntu-xenial, ubuntu-bionic, ubuntu-focal, ubuntu-groovy, ubuntu-hirsute, ubuntu-impish, ubunty-jammy, debian-stretch, debian-buster, debian-bullseye, debian-bookworm, debian-sid, linuxmint-17, linuxmint-18, linuxmint-19, linuxmint-19.3, linuxmint-20.1, linuxmint-20.2, linuxmint-20.3, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, fedora-35, fedora-36, centos-7, centos-8, gentoo-python3.9, gentoo-python3.10, 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]
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.5.beta8",
5-
"version": "9.5.beta8",
4+
"title": "sagemath/sage: 9.5.beta9",
5+
"version": "9.5.beta9",
66
"upload_type": "software",
7-
"publication_date": "2021-12-12",
7+
"publication_date": "2021-12-23",
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.beta8",
18+
"identifier": "https://github.com/sagemath/sage/tree/9.5.beta9",
1919
"relation": "isSupplementTo"
2020
},
2121
{

README.md

Lines changed: 44 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
> "Creating a Viable Open Source Alternative to
66
> Magma, Maple, Mathematica, and MATLAB"
77
8-
> Copyright (C) 2005-2020 The Sage Development Team
8+
> Copyright (C) 2005-2021 The Sage Development Team
99
1010
https://www.sagemath.org
1111

@@ -37,10 +37,14 @@ or ask on [ask.sagemath.org](https://ask.sagemath.org).
3737
Supported Platforms
3838
-------------------
3939

40-
Sage fully supports all major Linux distributions, recent versions of
40+
Sage attempts to support all major Linux distributions, recent versions of
4141
macOS, and Windows (using Cygwin, Windows Subsystem for Linux, or
4242
using virtualization).
4343

44+
Detailed information on supported platforms for a specific version of Sage
45+
can be found in the section "Availability and installation help" of the
46+
[release tour](https://wiki.sagemath.org/ReleaseTours) for this version.
47+
4448
We highly appreciate contributions to Sage that fix portability bugs
4549
and help port Sage to new platforms; let us know at the [sage-devel
4650
mailing list](https://groups.google.com/group/sage-devel).
@@ -234,8 +238,10 @@ Guide](https://doc.sagemath.org/html/en/installation).
234238
[debian.txt](build/pkgs/_prereq/distros/debian.txt)
235239
(also for Ubuntu, Linux Mint, etc.),
236240
[fedora.txt](build/pkgs/_prereq/distros/fedora.txt)
237-
(also for Red Hat, CentOS), and
238-
[slackware.txt](build/pkgs/_prereq/distros/slackware.txt).
241+
(also for Red Hat, CentOS),
242+
[opensuse.txt](build/pkgs/_prereq/distros/opensuse.txt)
243+
[slackware.txt](build/pkgs/_prereq/distros/slackware.txt), and
244+
[void.txt](build/pkgs/_prereq/distros/void.txt).
239245

240246
7. Optional: It is recommended that you have both LaTeX and the
241247
ImageMagick tools (e.g. the "convert" command) installed since some
@@ -349,53 +355,71 @@ Simplified directory layout (only essential files/directories):
349355
SAGE_ROOT Root directory (sage-x.y.z in Sage tarball)
350356
├── build
351357
│ └── pkgs Every package is a subdirectory here
352-
│ ├── 4ti2
358+
│ ├── 4ti2/
353359
│ …
354-
│ └── zn_poly
360+
│ └── zn_poly/
355361
├── configure Top-level configure script
356362
├── COPYING.txt Copyright information
357363
├── pkgs Source trees of Python distribution packages
358364
│ ├── sage-conf
359365
│ │ ├── sage_conf.py
360366
│ │ └── setup.py
361367
│ ├── sage-docbuild
362-
│ │ ├── sage_docbuild
368+
│ │ ├── sage_docbuild/
369+
│ │ └── setup.py
370+
│ ├── sage-setup
371+
│ │ ├── sage_setup/
363372
│ │ └── setup.py
364373
│ ├── sage-sws2rst
365-
│ │ ├── sage_sws2rst
374+
│ │ ├── sage_sws2rst/
366375
│ │ └── setup.py
367376
│ └── sagemath-standard
368-
│ ├── bin
369-
│ ├── sage
377+
│ ├── bin/
378+
│ ├── sage -> ../../src/sage
370379
│ └── setup.py
371-
├── local (SAGE_LOCAL) Compiled packages are installed here
380+
├── local (SAGE_LOCAL) Installation hierarchy for non-Python packages
372381
│ ├── bin Executables
373382
│ ├── include C/C++ headers
374-
│ ├── lib Shared libraries
383+
│ ├── lib Shared libraries, architecture-dependent data
375384
│ ├── share Databases, architecture-independent data, docs
376385
│ │ └── doc Viewable docs of Sage and of some components
377386
│ └── var
378-
│ ├── lib/sage List of installed packages
379-
│ └── tmp/sage Temporary files when building Sage
387+
│ ├── lib/sage
388+
│ │ ├── installed/
389+
│ │ │ Records of installed non-Python packages
390+
│ │ ├── scripts/ Scripts for uninstalling installed packages
391+
│ │ └── venv-python3.9 (SAGE_VENV)
392+
│ │ │ Installation hierarchy (virtual environment)
393+
│ │ │ for Python packages
394+
│ │ ├── bin/ Executables and installed scripts
395+
│ │ ├── lib/python3.9/site-packages/
396+
│ │ │ Python modules/packages are installed here
397+
│ │ └── var/lib/sage/
398+
│ │ └── wheels/
399+
│ │ Python wheels for all installed Python packages
400+
│ │
401+
│ └── tmp/sage/ Temporary files when building Sage
380402
├── logs
381403
│ ├── install.log Full install log
382404
│ └── pkgs Build logs of individual packages
383405
│ ├── alabaster-0.7.12.log
384406
│ …
385407
│ └── zn_poly-0.9.2.log
386-
├── m4 M4 macros for configure
408+
├── m4 M4 macros for generating the configure script
387409
│ └── *.m4
388410
├── Makefile Running "make" uses this file
411+
├── prefix -> SAGE_LOCAL Convenience symlink to the installation tree
389412
├── README.md This file
390413
├── sage Script to start Sage
391414
├── src Monolithic Sage library source tree
392-
│ ├── bin Scripts that Sage uses internally
393-
│ ├── doc Sage documentation sources
394-
│ └── sage The Sage library source code
415+
│ ├── bin/ Scripts that Sage uses internally
416+
│ ├── doc/ Sage documentation sources
417+
│ └── sage/ The Sage library source code
395418
├── upstream Source tarballs of packages
396419
│ ├── Babel-2.9.1.tar.gz
397420
│ …
398421
│ └── zn_poly-0.9.2.tar.gz
422+
├── venv -> SAGE_VENV Convenience symlink to the virtual environment
399423
└── VERSION.txt
400424
```
401425
For more details see [our Developer's Guide](https://doc.sagemath.org/html/en/developer/coding_basics.html#files-and-directory-structure).
@@ -481,9 +505,9 @@ do.
481505
1. To make a binary distribution with your currently installed packages,
482506
visit [sagemath/binary-pkg](https://github.com/sagemath/binary-pkg).
483507

484-
2. (**Obsolete, probably broken**) To make your own source tarball of Sage, type:
508+
2. To make your own source tarball of Sage, type:
485509

486-
$ sage --sdist
510+
$ make dist
487511

488512
The result is placed in the directory `dist/`.
489513

VERSION.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SageMath version 9.5.beta8, Release Date: 2021-12-12
1+
SageMath version 9.5.beta9, Release Date: 2021-12-23

build/make/Makefile.in

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -682,7 +682,16 @@ $(1)-uninstall: $(1)-$(4)-uninstall
682682

683683
$(1)-clean: $(1)-uninstall
684684

685+
# Recursive tox invocation (note - we do not set the environment here).
686+
# Setting SAGE_SPKG_WHEELS is for the benefit of sagelib's tox.ini
687+
$(1)-tox-%: FORCE
688+
$(AM_V_at)cd '$$(SAGE_ROOT)/build/pkgs/$(1)/src' && \
689+
export PATH="$$(SAGE_ORIG_PATH)" && \
690+
SAGE_SPKG_WHEELS=$$(SAGE_LOCAL)/var/lib/sage/wheels \
691+
tox -v -v -v -e $$*
692+
685693
.PHONY: $(1) $(1)-uninstall $(1)-build-deps $(1)-no-deps $(1)-clean
694+
686695
endef
687696

688697
$(foreach pkgname,$(SCRIPT_PACKAGES),\

build/pkgs/4ti2/distros/cygwin.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
lib4ti2_0
12
lib4ti2-devel

build/pkgs/_recommended/distros/debian.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ dvipng
1313
# to run the Jmol 3D viewer from the console and generate images for 3D plots in the documentation
1414
default-jdk
1515
# to produce animations
16-
ffmpeg
16+
# ffmpeg -- this is a separate script package
1717
libavdevice-dev

0 commit comments

Comments
 (0)