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

Commit a56dc35

Browse files
author
Matthias Koeppe
committed
Merge tag '9.2.beta1' into t/29702/public/move_all_code_from_src_setup_py__src_fpickle_setup_py_to_sage_setup
SageMath version 9.2.beta1, Release Date: 2020-06-13
2 parents 8a41326 + e2dcdee commit a56dc35

File tree

662 files changed

+17124
-11246
lines changed

Some content is hidden

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

662 files changed

+17124
-11246
lines changed

‎.ci/build-docker.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ rsync html_/ html/ -a --copy-links
4747

4848
# Build the release image without build artifacts.
4949
docker_build --target sagemath --tag "$DOCKER_IMAGE_CLI" .
50+
# Tag the sagemath:$DOCKER_TAG image that CI has just built as
51+
# sagemath:$COMMIT_HASH so we can refer to it uniquely later.
52+
docker tag "$DOCKER_IMAGE_CLI" "$DOCKER_IMAGE_BINDER"
5053
# Display the layers of this image
5154
docker history "$DOCKER_IMAGE_CLI"
5255
# Build the developer image with the build artifacts intact.

‎.ci/update-env.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ fi
4545
export DOCKER_IMAGE_CLI=${DOCKER_NAMESPACE:-sagemath}/sagemath:$DOCKER_TAG
4646
export DOCKER_IMAGE_DEV=${DOCKER_NAMESPACE:-sagemath}/sagemath-dev:$DOCKER_TAG
4747

48+
export DOCKER_IMAGE_BINDER="${DOCKER_NAMESPACE:-sagemath}/sagemath:${CI_COMMIT_SHA}"
49+
4850
# Seed the build cache with this image (set to source-clean to build from
4951
# scratch.)
5052
export ARTIFACT_BASE=${ARTIFACT_BASE:-$DEFAULT_ARTIFACT_BASE}

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

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

‎.github/workflows/tox-gcc_spkg.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
fail-fast: false
3737
matrix:
3838
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_packages_factor: [minimal-gcc_spkg, standard-gcc_spkg, standard-python2-gcc_spkg]
39+
tox_packages_factor: [minimal-gcc_spkg, standard-gcc_spkg]
4040
env:
4141
TOX_ENV: docker-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
4242
LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-docker-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
@@ -101,7 +101,7 @@ jobs:
101101
fail-fast: false
102102
matrix:
103103
tox_system_factor: [conda-forge-ubuntu]
104-
tox_packages_factor: [minimal-gcc_spkg, standard-gcc_spkg, standard-python2-gcc_spkg]
104+
tox_packages_factor: [minimal-gcc_spkg, standard-gcc_spkg]
105105
env:
106106
TOX_ENV: local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
107107
LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}

‎.github/workflows/tox-optional.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ jobs:
102102
fail-fast: false
103103
max-parallel: 3
104104
matrix:
105-
tox_system_factor: [homebrew-macos-python2, homebrew-macos, homebrew-macos-python3_xcode, homebrew-macos-python3_xcode-nokegonly, homebrew-macos-python3_pythonorg, conda-forge-macos]
105+
tox_system_factor: [homebrew-macos, homebrew-macos-python3_xcode, homebrew-macos-python3_xcode-nokegonly, homebrew-macos-python3_pythonorg, conda-forge-macos]
106106
tox_packages_factor: [maximal]
107107
env:
108108
TOX_ENV: local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}

‎.github/workflows/tox.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
max-parallel: 20
3838
matrix:
3939
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]
40-
tox_packages_factor: [minimal, standard, standard-python2]
40+
tox_packages_factor: [minimal, standard]
4141
env:
4242
TOX_ENV: docker-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
4343
LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-docker-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
@@ -102,7 +102,7 @@ jobs:
102102
fail-fast: false
103103
max-parallel: 4
104104
matrix:
105-
tox_system_factor: [homebrew-macos-python2, homebrew-macos, homebrew-macos-python3_xcode, homebrew-macos-python3_xcode-nokegonly, homebrew-macos-python3_pythonorg, homebrew-macos-python3_xcode-gcc_spkg, conda-forge-macos]
105+
tox_system_factor: [homebrew-macos, homebrew-macos-python3_xcode, homebrew-macos-python3_xcode-nokegonly, homebrew-macos-python3_pythonorg, homebrew-macos-python3_xcode-gcc_spkg, conda-forge-macos]
106106
tox_packages_factor: [minimal, standard]
107107
env:
108108
TOX_ENV: local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
@@ -147,7 +147,7 @@ jobs:
147147
max-parallel: 1
148148
matrix:
149149
tox_system_factor: [conda-forge-ubuntu]
150-
tox_packages_factor: [minimal, standard, standard-python2]
150+
tox_packages_factor: [minimal, standard]
151151
env:
152152
TOX_ENV: local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
153153
LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}

‎.gitlab-ci.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
# If you want to provide your own runners, make sure to tag them as follows:
3838
# * "big" (60GB of disk space are available) to make build-from-clean pass.
3939

40-
image: docker:latest
40+
image: docker:stable
4141

4242
stages:
4343
- build
@@ -77,7 +77,7 @@ before_script:
7777
# better isolation. If you expect many builds to run simultaneously on a host,
7878
# conflicting tags can cause issues with a mounted DOCKER_HOST.
7979
services:
80-
- docker:18.05.0-ce-dind
80+
- docker:stable-dind
8181

8282
# Build Sage and its documentation.
8383
# The build starts from the build artifacts of DEFAULT_ARTIFACT_BASE which is
@@ -100,6 +100,7 @@ build-from-latest:
100100
- .ci/build-docker.sh | tee gitlab-build-docker.log | .ci/head-tail.sh 1048576
101101
- .ci/push-gitlab.sh sagemath-dev
102102
- .ci/push-gitlab.sh sagemath
103+
- DOCKER_TAG=$CI_COMMIT_SHA .ci/push-gitlab.sh sagemath
103104
except:
104105
- master
105106
- develop

‎Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ distclean: build-clean
105105
bootstrap-clean:
106106
rm -rf config configure build/make/Makefile-auto.in
107107
rm -f src/doc/en/installation/*.txt
108+
rm -rf src/doc/en/reference/spkg/*.rst
108109

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

‎VERSION.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SageMath version 9.2.beta0, Release Date: 2020-05-28
1+
SageMath version 9.2.beta1, Release Date: 2020-06-13

‎bootstrap‎

Lines changed: 1 addition & 1 deletion
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
163+
tar zcf "$NEWCONFBALL" configure config/* build/make/Makefile-auto.in src/doc/en/installation/*.txt src/doc/en/reference/spkg/*.rst
164164

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

0 commit comments

Comments
 (0)