Skip to content

Commit 5123115

Browse files
author
Matthias Koeppe
committed
Merge tag '9.5.beta4' into t/32205/remove_deprecations
SageMath version 9.5.beta4, Release Date: 2021-10-19
2 parents 9a9e4d8 + 056b8d4 commit 5123115

File tree

2,012 files changed

+91782
-25858
lines changed

Some content is hidden

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

2,012 files changed

+91782
-25858
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/lint.yml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,3 @@ jobs:
3131
run: pip install tox relint
3232
- name: Lint using relint
3333
run: tox -e relint src/sage/
34-
lint-pyright:
35-
name: Static type check with pyright
36-
runs-on: ubuntu-latest
37-
steps:
38-
- name: Checkout
39-
uses: actions/checkout@v2
40-
- name: Set up node to install pyright
41-
uses: actions/setup-node@v1
42-
with:
43-
node-version: '12'
44-
- name: Install pyright
45-
run: npm install -g pyright
46-
- name: Lint using pyright
47-
run: pyright

‎.github/workflows/sdist.yml

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
name: Prepare source distributions
2+
3+
on:
4+
push:
5+
tags:
6+
# Match all release tags including beta, rc
7+
- '[0-9]+.[0-9]+'
8+
- '[0-9]+.[0-9]+.[0-9]+'
9+
- '[0-9]+.[0-9]+.beta[0-9]+'
10+
- '[0-9]+.[0-9]+.[0-9]+.beta[0-9]+'
11+
- '[0-9]+.[0-9]+.rc[0-9]+'
12+
- '[0-9]+.[0-9]+.[0-9]+.rc[0-9]+'
13+
14+
workflow_dispatch:
15+
# Allow to run manually
16+
17+
jobs:
18+
19+
release_dist:
20+
21+
# This job, in contrast to "dist" in tox.yml,
22+
# does not use "configure --enable-download-from-upstream-url".
23+
#
24+
# In this way, we check that all necessary package tarballs
25+
# have already been uploaded to the Sage server at the time
26+
# of pushing a release tag.
27+
#
28+
# It also uses "bootstrap -D", thus checking that the "configure"
29+
# tarball has been uploaded to the Sage server at the time
30+
# of pushing a release tag.
31+
32+
runs-on: ubuntu-latest
33+
steps:
34+
- uses: actions/checkout@v2
35+
- name: Install bootstrap prerequisites
36+
run: |
37+
sudo DEBIAN_FRONTEND=noninteractive apt-get update
38+
sudo DEBIAN_FRONTEND=noninteractive apt-get install $(build/bin/sage-get-system-packages debian _bootstrap)
39+
- name: make dist
40+
run: |
41+
./bootstrap -D && ./configure && make dist
42+
- uses: actions/upload-artifact@v2
43+
with:
44+
path: "dist/*.tar.gz"
45+
name: release_dist

‎.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-gcc_spkg.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ on:
2727
# Allow to run manually
2828

2929
env:
30-
TARGETS_PRE: sagelib-build-deps
30+
TARGETS_PRE: all-sage-local
3131
TARGETS: build doc-html
3232
TARGETS_OPTIONAL: ptest
3333

‎.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

‎.github/workflows/tox.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ on:
2727
# Allow to run manually
2828

2929
env:
30-
TARGETS_PRE: sagelib-build-deps
30+
TARGETS_PRE: all-sage-local
3131
TARGETS: build doc-html
3232
TARGETS_OPTIONAL: ptest
3333

@@ -257,7 +257,7 @@ jobs:
257257
SAGE_ROOT=. SAGE_SRC=./src src/bin/sage-update-version $(git describe) || echo "(ignoring error)"
258258
- name: make dist
259259
run: |
260-
./configure && make dist
260+
./configure --enable-download-from-upstream-url && make dist
261261
- uses: actions/upload-artifact@v2
262262
with:
263263
path: "dist/*.tar.gz"

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ __pycache__/
144144
!/src/sage/stats/distributions/dgs_bern.c
145145
!/src/sage/stats/distributions/dgs_gauss_dp.c
146146
!/src/sage/stats/distributions/dgs_gauss_mp.c
147+
!/src/sage/symbolic/ginac/*.cpp
147148
/src/cython_debug
148149

149150
# Temporary build files
@@ -181,6 +182,7 @@ src/*.egg-info/
181182
/src/bin/sage-src-env-config
182183

183184
# Virtual environments
185+
/venv
184186
src/.env
185187
src/.venv
186188
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.4.rc0",
5-
"version": "9.4.rc0",
4+
"title": "sagemath/sage: 9.5.beta4",
5+
"version": "9.5.beta4",
66
"upload_type": "software",
7-
"publication_date": "2021-07-27",
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.4.rc0",
18+
"identifier": "https://github.com/sagemath/sage/tree/9.5.beta4",
1919
"relation": "isSupplementTo"
2020
},
2121
{

0 commit comments

Comments
 (0)