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

Commit d3c608b

Browse files
author
Matthias Koeppe
committed
Merge tag '9.2.beta3' into t/29701/replace_use_of_module_list_optionalextension
SageMath version 9.2.beta3, Release Date: 2020-07-04
2 parents 034a7f7 + a79b0fc commit d3c608b

File tree

361 files changed

+2353
-2262
lines changed

Some content is hidden

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

361 files changed

+2353
-2262
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ jobs:
9494
cygwin-stage-i-b:
9595
env:
9696
STAGE: i-b
97-
TARGETS: cython setuptools_scm kiwisolver dateutil cycler pyparsing nose certifi singledispatch pkgconfig pplpy
97+
TARGETS: cython setuptools_scm kiwisolver dateutil cycler pyparsing nose certifi pkgconfig pplpy
9898
LOCAL_ARTIFACT_NAME: sage-local-commit-${{ github.sha }}-cygwin-${{ matrix.pkgs }}
9999
LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-cygwin-${{ matrix.pkgs }}
100100

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ jobs:
9494
cygwin-stage-i-b:
9595
env:
9696
STAGE: i-b
97-
TARGETS: cython setuptools_scm kiwisolver dateutil cycler pyparsing nose certifi singledispatch pkgconfig pplpy
97+
TARGETS: cython setuptools_scm kiwisolver dateutil cycler pyparsing nose certifi pkgconfig pplpy
9898
LOCAL_ARTIFACT_NAME: sage-local-commit-${{ github.sha }}-cygwin-${{ matrix.pkgs }}
9999
LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-cygwin-${{ matrix.pkgs }}
100100

‎.github/workflows/tox-gcc_spkg.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Run SAGE_ROOT/tox.ini
1+
name: Test Linux --without-system-gcc
22

33
## This GitHub Actions workflow runs SAGE_ROOT/tox.ini with select environments,
44
## whenever a GitHub pull request is opened or synchronized in a repository
@@ -34,8 +34,9 @@ jobs:
3434
runs-on: ubuntu-latest
3535
strategy:
3636
fail-fast: false
37+
max-parallel: 5
3738
matrix:
38-
tox_system_factor: [ubuntu-trusty, ubuntu-xenial, ubuntu-bionic, ubuntu-eoan, ubuntu-focal, debian-jessie, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-17, linuxmint-18, linuxmint-19, linuxmint-19.3, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, centos-7, centos-8, archlinux-latest, slackware-14.2, conda-forge, ubuntu-bionic-i386, ubuntu-eoan-i386, debian-buster-i386, centos-7-i386]
39+
tox_system_factor: [ubuntu-trusty, ubuntu-focal, fedora-27, fedora-31, debian-buster-i386]
3940
tox_packages_factor: [minimal-gcc_spkg, standard-gcc_spkg]
4041
env:
4142
TOX_ENV: docker-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
@@ -99,6 +100,7 @@ jobs:
99100
runs-on: ubuntu-latest
100101
strategy:
101102
fail-fast: false
103+
max-parallel: 1
102104
matrix:
103105
tox_system_factor: [conda-forge-ubuntu]
104106
tox_packages_factor: [minimal-gcc_spkg, standard-gcc_spkg]

‎.github/workflows/tox-optional.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
fail-fast: false
3737
max-parallel: 6
3838
matrix:
39-
tox_system_factor: [ubuntu-trusty, ubuntu-xenial, ubuntu-bionic, ubuntu-eoan, ubuntu-focal, debian-jessie, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-17, linuxmint-18, linuxmint-19, linuxmint-19.3, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, centos-7, centos-8, archlinux-latest, slackware-14.2, conda-forge, ubuntu-bionic-i386, ubuntu-eoan-i386, debian-buster-i386, centos-7-i386]
39+
tox_system_factor: [ubuntu-trusty, ubuntu-xenial, ubuntu-bionic, ubuntu-eoan, ubuntu-focal, debian-jessie, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-17, linuxmint-18, linuxmint-19, linuxmint-19.3, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, centos-7, centos-8, gentoo, archlinux-latest, slackware-14.2, conda-forge, ubuntu-bionic-i386, ubuntu-eoan-i386, debian-buster-i386, centos-7-i386]
4040
tox_packages_factor: [maximal]
4141
env:
4242
TOX_ENV: docker-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}

‎.github/workflows/tox.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
fail-fast: false
3737
max-parallel: 20
3838
matrix:
39-
tox_system_factor: [ubuntu-trusty, ubuntu-xenial, ubuntu-bionic, ubuntu-eoan, ubuntu-focal, debian-jessie, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-17, linuxmint-18, linuxmint-19, linuxmint-19.3, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, centos-7, centos-8, archlinux-latest, slackware-14.2, conda-forge, ubuntu-bionic-i386, ubuntu-eoan-i386, debian-buster-i386, centos-7-i386]
39+
tox_system_factor: [ubuntu-trusty, ubuntu-xenial, ubuntu-bionic, ubuntu-eoan, ubuntu-focal, debian-jessie, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-17, linuxmint-18, linuxmint-19, linuxmint-19.3, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, centos-7, centos-8, gentoo, archlinux-latest, slackware-14.2, conda-forge, ubuntu-bionic-i386, ubuntu-eoan-i386, debian-buster-i386, centos-7-i386]
4040
tox_packages_factor: [minimal, standard]
4141
env:
4242
TOX_ENV: docker-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}

‎.github/workflows/update-cygwin-yml.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#!/usr/bin/env bash
2-
for X in standard-python2 minimal; do sed 's/\[standard\]/['$X']/g;s/CI cygwin-standard/CI cygwin-'$X'/g;' ci-cygwin-standard.yml > ci-cygwin-$X.yml; done
2+
for X in minimal; do sed 's/\[standard\]/['$X']/g;s/CI cygwin-standard/CI cygwin-'$X'/g;' ci-cygwin-standard.yml > ci-cygwin-$X.yml; done

‎Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ bootstrap-clean:
110110
rm -rf config configure build/make/Makefile-auto.in
111111
rm -f src/doc/en/installation/*.txt
112112
rm -rf src/doc/en/reference/spkg/*.rst
113+
rm -f src/doc/en/reference/repl/*.txt
113114

114115
# Remove absolutely everything which isn't part of the git repo
115116
maintainer-clean: distclean bootstrap-clean

‎VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SageMath version 9.2.beta2, Release Date: 2020-06-26
1+
SageMath version 9.2.beta3, Release Date: 2020-07-04

‎bootstrap

+1-1
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ save () {
160160
# Create configure tarball
161161
echo "Creating $NEWCONFBALL..."
162162
mkdir -p upstream
163-
tar zcf "$NEWCONFBALL" configure config/* build/make/Makefile-auto.in src/doc/en/installation/*.txt src/doc/en/reference/spkg/*.rst
163+
tar zcf "$NEWCONFBALL" configure config/* build/make/Makefile-auto.in src/doc/en/installation/*.txt src/doc/en/reference/spkg/*.rst src/doc/en/reference/repl/*.txt
164164

165165
# Update version
166166
echo "$NEWCONFVERSION" >$PKG/package-version.txt

‎build/bin/sage-print-system-package-command

+3
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@ case $system:$command in
5858
@(fedora*|redhat*|centos*):install)
5959
[ -n "$system_packages" ] && echo "${PROMPT}${SUDO}yum install $system_packages"
6060
;;
61+
gentoo*:install)
62+
[ -n "$system_packages" ] && echo "${PROMPT}${SUDO}emerge $system_packages"
63+
;;
6164
arch*:install)
6265
[ -n "$system_packages" ] && echo "${PROMPT}${SUDO}pacman -S $system_packages"
6366
;;

0 commit comments

Comments
 (0)