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

Commit 2078fa6

Browse files
author
Matthias Koeppe
committed
Merge tag '9.4.beta0' into t/31593/configure__paths_within__sage_local___prefix__for_sage_conf
SageMath version 9.4.beta0, Release Date: 2021-05-25
2 parents 986ca18 + 6aa4ece commit 2078fa6

File tree

382 files changed

+19939
-4336
lines changed

Some content is hidden

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

382 files changed

+19939
-4336
lines changed

‎.github/workflows/tox-experimental.yml

+22-35
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
fail-fast: false
3939
max-parallel: 6
4040
matrix:
41-
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]
41+
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, 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: [maximal]
4343
targets_pattern: [0-g, h-o, p, q-z]
4444
env:
@@ -54,15 +54,21 @@ jobs:
5454
run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
5555
- name: free disk space
5656
run: |
57+
df -h
5758
sudo swapoff -a
5859
sudo rm -f /swapfile
59-
sudo apt clean
60+
sudo apt-get clean
6061
docker rmi $(docker image ls -aq)
62+
echo "Largest packages:"
63+
dpkg-query -Wf '${Installed-Size}\t${Package}\n' | sort -n | tail -n 50
64+
sudo apt-get --fix-broken --yes remove $(dpkg-query -f '${Package}\n' -W | grep -E '^(ghc-|google-cloud-sdk|google-chrome|firefox|mysql-server|dotnet-sdk|hhvm|mono)') || echo "(error ignored)"
6165
df -h
6266
- name: Install test prerequisites
6367
run: |
6468
sudo DEBIAN_FRONTEND=noninteractive apt-get update
6569
sudo DEBIAN_FRONTEND=noninteractive apt-get install tox
70+
sudo apt-get clean
71+
df -h
6672
- name: Try to login to docker.pkg.github.com
6773
# https://docs.github.com/en/actions/reference/workflow-commands-for-github-actions#setting-an-environment-variable
6874
run: |
@@ -106,54 +112,35 @@ jobs:
106112
fail-fast: false
107113
max-parallel: 3
108114
matrix:
109-
tox_system_factor: [homebrew-macos, conda-forge-macos]
110-
tox_packages_factor: [minimal, standard]
115+
tox_system_factor: [homebrew-macos, conda-forge-macos, homebrew-macos-python3_xcode]
116+
tox_packages_factor: [maximal]
111117
# As of 2021-03, default xcode is 12.4
112118
# https://github.com/actions/virtual-environments/blob/main/images/macos/macos-10.15-Readme.md#xcode
113119
xcode_version_factor: [default]
120+
targets_pattern: [0-g, h-o, p, q-z]
114121
os: [ macos-10.15, macos-11.0 ]
115122
include:
116123
# Test xcode 11.7 only on macos-10.15
117124
- tox_system_factor: homebrew-macos
118-
tox_packages_factor: minimal
125+
tox_packages_factor: maximal
119126
xcode_version_factor: 11.7
127+
targets_pattern: 0-g
120128
os: macos-10.15
121129
- tox_system_factor: homebrew-macos
122-
tox_packages_factor: standard
130+
tox_packages_factor: maximal
123131
xcode_version_factor: 11.7
132+
targets_pattern: h-o
124133
os: macos-10.15
125-
# python3_xcode is only accepted if enough packages are available from the system
126-
# --> to test "minimal", we will need https://trac.sagemath.org/ticket/30949
127-
- tox_system_factor: homebrew-macos-python3_xcode
128-
tox_packages_factor: standard
134+
- tox_system_factor: homebrew-macos
135+
tox_packages_factor: maximal
129136
xcode_version_factor: 11.7
137+
targets_pattern: p
130138
os: macos-10.15
131-
- tox_system_factor: homebrew-macos-python3_xcode
132-
tox_packages_factor: standard
133-
xcode_version_factor: default
139+
- tox_system_factor: homebrew-macos
140+
tox_packages_factor: maximal
141+
xcode_version_factor: 11.7
142+
targets_pattern: q-z
134143
os: macos-10.15
135-
- tox_system_factor: homebrew-macos-python3_xcode
136-
tox_packages_factor: standard
137-
xcode_version_factor: default
138-
os: macos-11.0
139-
- tox_system_factor: homebrew-macos-python3_xcode-nokegonly
140-
tox_packages_factor: standard
141-
xcode_version_factor: default
142-
os: macos-11.0
143-
# likewise for python3_pythonorg
144-
- tox_system_factor: homebrew-macos-python3_pythonorg
145-
tox_packages_factor: standard
146-
xcode_version_factor: default
147-
os: macos-11.0
148-
# conda-forge-macos-environment
149-
- tox_system_factor: conda-forge-macos
150-
tox_packages_factor: environment
151-
xcode_version_factor: default
152-
os: macos-11.0
153-
- tox_system_factor: conda-forge-macos
154-
tox_packages_factor: environment-optional
155-
xcode_version_factor: default
156-
os: macos-11.0
157144
env:
158145
TOX_ENV: local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
159146
LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}-${{ matrix.os }}-xcode_${{ matrix.xcode_version_factor }}

‎.github/workflows/tox-gcc_spkg.yml

+7-1
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,21 @@ jobs:
5252
run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
5353
- name: free disk space
5454
run: |
55+
df -h
5556
sudo swapoff -a
5657
sudo rm -f /swapfile
57-
sudo apt clean
58+
sudo apt-get clean
5859
docker rmi $(docker image ls -aq)
60+
echo "Largest packages:"
61+
dpkg-query -Wf '${Installed-Size}\t${Package}\n' | sort -n | tail -n 50
62+
sudo apt-get --fix-broken --yes remove $(dpkg-query -f '${Package}\n' -W | grep -E '^(ghc-|google-cloud-sdk|google-chrome|firefox|mysql-server|dotnet-sdk|hhvm|mono)') || echo "(error ignored)"
5963
df -h
6064
- name: Install test prerequisites
6165
run: |
6266
sudo DEBIAN_FRONTEND=noninteractive apt-get update
6367
sudo DEBIAN_FRONTEND=noninteractive apt-get install tox
68+
sudo apt-get clean
69+
df -h
6470
- name: Try to login to docker.pkg.github.com
6571
# https://docs.github.com/en/actions/reference/workflow-commands-for-github-actions#setting-an-environment-variable
6672
run: |

‎.github/workflows/tox-optional.yml

+22-35
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
fail-fast: false
3939
max-parallel: 6
4040
matrix:
41-
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]
41+
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, 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: [maximal]
4343
targets_pattern: [0-g, h-o, p, q-z]
4444
env:
@@ -56,15 +56,21 @@ jobs:
5656
run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
5757
- name: free disk space
5858
run: |
59+
df -h
5960
sudo swapoff -a
6061
sudo rm -f /swapfile
61-
sudo apt clean
62+
sudo apt-get clean
6263
docker rmi $(docker image ls -aq)
64+
echo "Largest packages:"
65+
dpkg-query -Wf '${Installed-Size}\t${Package}\n' | sort -n | tail -n 50
66+
sudo apt-get --fix-broken --yes remove $(dpkg-query -f '${Package}\n' -W | grep -E '^(ghc-|google-cloud-sdk|google-chrome|firefox|mysql-server|dotnet-sdk|hhvm|mono)') || echo "(error ignored)"
6367
df -h
6468
- name: Install test prerequisites
6569
run: |
6670
sudo DEBIAN_FRONTEND=noninteractive apt-get update
6771
sudo DEBIAN_FRONTEND=noninteractive apt-get install tox
72+
sudo apt-get clean
73+
df -h
6874
- name: Try to login to docker.pkg.github.com
6975
# https://docs.github.com/en/actions/reference/workflow-commands-for-github-actions#setting-an-environment-variable
7076
run: |
@@ -108,54 +114,35 @@ jobs:
108114
fail-fast: false
109115
max-parallel: 3
110116
matrix:
111-
tox_system_factor: [homebrew-macos, conda-forge-macos]
112-
tox_packages_factor: [minimal, standard]
117+
tox_system_factor: [homebrew-macos, conda-forge-macos, homebrew-macos-python3_xcode]
118+
tox_packages_factor: [maximal]
113119
# As of 2021-03, default xcode is 12.4
114120
# https://github.com/actions/virtual-environments/blob/main/images/macos/macos-10.15-Readme.md#xcode
115121
xcode_version_factor: [default]
122+
targets_pattern: [0-g, h-o, p, q-z]
116123
os: [ macos-10.15, macos-11.0 ]
117124
include:
118125
# Test xcode 11.7 only on macos-10.15
119126
- tox_system_factor: homebrew-macos
120-
tox_packages_factor: minimal
127+
tox_packages_factor: maximal
121128
xcode_version_factor: 11.7
129+
targets_pattern: 0-g
122130
os: macos-10.15
123131
- tox_system_factor: homebrew-macos
124-
tox_packages_factor: standard
132+
tox_packages_factor: maximal
125133
xcode_version_factor: 11.7
134+
targets_pattern: h-o
126135
os: macos-10.15
127-
# python3_xcode is only accepted if enough packages are available from the system
128-
# --> to test "minimal", we will need https://trac.sagemath.org/ticket/30949
129-
- tox_system_factor: homebrew-macos-python3_xcode
130-
tox_packages_factor: standard
136+
- tox_system_factor: homebrew-macos
137+
tox_packages_factor: maximal
131138
xcode_version_factor: 11.7
139+
targets_pattern: p
132140
os: macos-10.15
133-
- tox_system_factor: homebrew-macos-python3_xcode
134-
tox_packages_factor: standard
135-
xcode_version_factor: default
141+
- tox_system_factor: homebrew-macos
142+
tox_packages_factor: maximal
143+
xcode_version_factor: 11.7
144+
targets_pattern: q-z
136145
os: macos-10.15
137-
- tox_system_factor: homebrew-macos-python3_xcode
138-
tox_packages_factor: standard
139-
xcode_version_factor: default
140-
os: macos-11.0
141-
- tox_system_factor: homebrew-macos-python3_xcode-nokegonly
142-
tox_packages_factor: standard
143-
xcode_version_factor: default
144-
os: macos-11.0
145-
# likewise for python3_pythonorg
146-
- tox_system_factor: homebrew-macos-python3_pythonorg
147-
tox_packages_factor: standard
148-
xcode_version_factor: default
149-
os: macos-11.0
150-
# conda-forge-macos-environment
151-
- tox_system_factor: conda-forge-macos
152-
tox_packages_factor: environment
153-
xcode_version_factor: default
154-
os: macos-11.0
155-
- tox_system_factor: conda-forge-macos
156-
tox_packages_factor: environment-optional
157-
xcode_version_factor: default
158-
os: macos-11.0
159146
env:
160147
TOX_ENV: local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
161148
LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}-${{ matrix.os }}-xcode_${{ matrix.xcode_version_factor }}

‎.github/workflows/tox.yml

+8-2
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, 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]
41+
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, 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 }}
@@ -52,15 +52,21 @@ jobs:
5252
run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
5353
- name: free disk space
5454
run: |
55+
df -h
5556
sudo swapoff -a
5657
sudo rm -f /swapfile
57-
sudo apt clean
58+
sudo apt-get clean
5859
docker rmi $(docker image ls -aq)
60+
echo "Largest packages:"
61+
dpkg-query -Wf '${Installed-Size}\t${Package}\n' | sort -n | tail -n 50
62+
sudo apt-get --fix-broken --yes remove $(dpkg-query -f '${Package}\n' -W | grep -E '^(ghc-|google-cloud-sdk|google-chrome|firefox|mysql-server|dotnet-sdk|hhvm|mono)') || echo "(error ignored)"
5963
df -h
6064
- name: Install test prerequisites
6165
run: |
6266
sudo DEBIAN_FRONTEND=noninteractive apt-get update
6367
sudo DEBIAN_FRONTEND=noninteractive apt-get install tox
68+
sudo apt-get clean
69+
df -h
6470
- name: Try to login to docker.pkg.github.com
6571
# https://docs.github.com/en/actions/reference/workflow-commands-for-github-actions#setting-an-environment-variable
6672
run: |

‎.gitignore

+22
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,14 @@
2323
/src/environment.yml
2424
/src/environment-optional.yml
2525

26+
/src/setup.cfg
27+
/src/requirements.txt
28+
/src/pyproject.toml
29+
/src/Pipfile
30+
/src/Pipfile.lock
31+
/Pipfile
32+
/Pipfile.lock
33+
2634
# Various editors
2735
*~
2836

@@ -93,6 +101,9 @@ __pycache__/
93101
*.py[cod]
94102
*$py.class
95103

104+
# Generated by sage_setup.autogen
105+
/src/sage/ext/interpreters
106+
96107
# Generated Cython files
97108
*.so
98109
src/sage/**/*.c
@@ -130,6 +141,14 @@ build/bin/sage-build-env-config
130141
/build/pkgs/*/src/*.egg-info
131142
/build/pkgs/*/src/.tox
132143

144+
# Generated by docbuild
145+
/src/doc/en/reference/*/sage
146+
/src/doc/en/reference/sage
147+
/src/doc/en/reference/spkg/*.rst
148+
/src/doc/output
149+
/src/doc/en/installation/*.txt
150+
/src/doc/en/reference/repl/*.txt
151+
133152
# Distribution / packaging
134153
src/*.egg-info/
135154
/src/.cython_version
@@ -152,5 +171,8 @@ src/venv.bak/
152171

153172
# tox generated files
154173
/.tox
174+
/build/.tox
155175
/prefix
176+
177+
# git worktree
156178
worktree*

‎.zenodo.json

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

‎Pipfile.m4

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
## Pipfile with all packages in the Sage distribution and version information locked
2+
## FIXME: Many packages still missing.
3+
[[source]]
4+
name = "pypi"
5+
url = "https://pypi.org/simple"
6+
verify_ssl = true
7+
8+
[dev-packages]
9+
pkgconfig = "==esyscmd(`printf $(sed "s/[.]p.*//;" ../pkgconfig/package-version.txt)')"
10+
cython = "==esyscmd(`printf $(sed "s/[.]p.*//;" ../cython/package-version.txt)')"
11+
pycodestyle = "*"
12+
ipykernel = "==esyscmd(`printf $(sed "s/[.]p.*//;" ../ipykernel/package-version.txt)')"
13+
tox = "*"
14+
jinja2 = "==esyscmd(`printf $(sed "s/[.]p.*//;" ../jinja2/package-version.txt)')"
15+
pytest = "*"
16+
ipywidgets = "==esyscmd(`printf $(sed "s/[.]p.*//;" ../ipywidgets/package-version.txt)')"
17+
sphinx = "==esyscmd(`printf $(sed "s/[.]p.*//;" ../sphinx/package-version.txt)')"
18+
rope = "*"
19+
six = "*"
20+
jupyter-core = "==esyscmd(`printf $(sed "s/[.]p.*//;" ../jupyter_core/package-version.txt)')"
21+
22+
[packages]
23+
numpy = "==esyscmd(`printf $(sed "s/[.]p.*//;" ../numpy/package-version.txt)')"
24+
cysignals = "==esyscmd(`printf $(sed "s/[.]p.*//;" ../cysignals/package-version.txt)')"
25+
cypari2 = "==esyscmd(`printf $(sed "s/[.]p.*//;" ../cypari/package-version.txt)')"
26+
gmpy2 = "==esyscmd(`printf $(sed "s/[.]p.*//;" ../gmpy2/package-version.txt)')"
27+
psutil = "==esyscmd(`printf $(sed "s/[.]p.*//;" ../psutil/package-version.txt)')"
28+
pexpect = "==esyscmd(`printf $(sed "s/[.]p.*//;" ../pexpect/package-version.txt)')"
29+
ipython = "==esyscmd(`printf $(sed "s/[.]p.*//;" ../ipython/package-version.txt)')"
30+
sympy = "==esyscmd(`printf $(sed "s/[.]p.*//;" ../sympy/package-version.txt)')"
31+
scipy = "==esyscmd(`printf $(sed "s/[.]p.*//;" ../scipy/package-version.txt)')"
32+
pplpy = "==esyscmd(`printf $(sed "s/[.]p.*//;" ../pplpy/package-version.txt)')"
33+
matplotlib = "==esyscmd(`printf $(sed "s/[.]p.*//;" ../matplotlib/package-version.txt)')"
34+
cvxopt = "==esyscmd(`printf $(sed "s/[.]p.*//;" ../cvxopt/package-version.txt)')"
35+
rpy2 = "==esyscmd(`printf $(sed "s/[.]p.*//;" ../rpy2/package-version.txt)')"
36+
networkx = "==esyscmd(`printf $(sed "s/[.]p.*//;" ../networkx/package-version.txt)')"
37+
38+
sagemath-standard = { path = "src" }
39+
40+
[requires]
41+
python_version = "3.9"

‎VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SageMath version 9.3.rc1, Release Date: 2021-03-29
1+
SageMath version 9.4.beta0, Release Date: 2021-05-25

0 commit comments

Comments
 (0)