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

Commit

Permalink
Merge tag '9.8.beta6' into public/33360
Browse files Browse the repository at this point in the history
SageMath version 9.8.beta6, Release Date: 2022-12-21
  • Loading branch information
yyyyx4 committed Jan 15, 2023
2 parents 4ac2c9b + 2114066 commit 100b39c
Show file tree
Hide file tree
Showing 833 changed files with 19,231 additions and 7,192 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
steps:
- name: Checkout
id: checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Prepare
id: prepare
Expand Down Expand Up @@ -55,7 +55,7 @@ jobs:

- name: Set up node to install pyright
if: always() && steps.prepare.outcome == 'success'
uses: actions/setup-node@v1
uses: actions/setup-node@v3
with:
node-version: '12'

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-conda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
conda-env: [environment, environment-optional]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Check for Miniconda
id: check_conda
Expand Down
1,044 changes: 1,044 additions & 0 deletions .github/workflows/ci-cygwin-minimal.yml

Large diffs are not rendered by default.

12 changes: 7 additions & 5 deletions .github/workflows/ci-cygwin-standard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,13 @@ jobs:
needs: [cygwin-stage-i-a, cygwin-stage-i-b]

cygwin-stage-ii-e:
uses: ./.github/workflows/cygwin.yml
with:
stage: ii-e
previous_stages: i-*
targets: threejs tachyon pillow jmol m4rie sympy lrcalc lcalc symmetrica cliquer libbraiding planarity rw elliptic_curves combinatorial_designs zn_poly sympow
env:
STAGE: ii-e
PREVIOUS_STAGES: i-*
TARGETS: threejs tachyon pillow jmol m4rie sympy lrcalc lcalc symmetrica cliquer libbraiding planarity rw elliptic_curves combinatorial_designs sympow
LOCAL_ARTIFACT_NAME: sage-local-commit-${{ github.sha }}-cygwin-${{ matrix.pkgs }}
LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-cygwin-${{ matrix.pkgs }}

needs: [cygwin-stage-i-a, cygwin-stage-i-b]

############################################## stage-iii ##########################################
Expand Down
11 changes: 9 additions & 2 deletions .github/workflows/ci-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ jobs:
with:
# Build incrementally from previous stage (pre)
incremental: true
free_disk_space: true
from_docker_repository: ghcr.io/${{ github.repository }}/
from_docker_target: "with-targets-pre"
docker_targets: "with-targets with-targets-optional"
Expand Down Expand Up @@ -82,6 +83,7 @@ jobs:
with:
# Build incrementally from previous stage (pre)
incremental: true
free_disk_space: true
from_docker_repository: ghcr.io/${{ github.repository }}/
from_docker_target: "with-targets-pre"
docker_targets: "with-targets with-targets-optional"
Expand All @@ -97,6 +99,7 @@ jobs:
needs: [minimal]
uses: ./.github/workflows/docker.yml
with:
free_disk_space: true
# Build from scratch
docker_targets: "with-system-packages configured with-targets-pre"
# FIXME: duplicated from env.TARGETS
Expand All @@ -111,6 +114,7 @@ jobs:
uses: ./.github/workflows/docker.yml
with:
incremental: true
free_disk_space: true
from_docker_repository: ghcr.io/${{ github.repository }}/
from_docker_target: "with-targets-pre"
tox_packages_factors: >-
Expand All @@ -125,6 +129,7 @@ jobs:
uses: ./.github/workflows/docker.yml
with:
incremental: true
free_disk_space: true
from_docker_repository: ghcr.io/${{ github.repository }}/
from_docker_target: "with-targets-pre"
tox_packages_factors: >-
Expand All @@ -138,6 +143,7 @@ jobs:
uses: ./.github/workflows/docker.yml
with:
incremental: true
free_disk_space: true
from_docker_repository: ghcr.io/${{ github.repository }}/
from_docker_target: "with-targets-pre"
tox_packages_factors: >-
Expand All @@ -151,6 +157,7 @@ jobs:
uses: ./.github/workflows/docker.yml
with:
incremental: true
free_disk_space: true
from_docker_repository: ghcr.io/${{ github.repository }}/
from_docker_target: "with-targets-pre"
tox_packages_factors: >-
Expand All @@ -171,7 +178,7 @@ jobs:
TOX_ENV: local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Install test prerequisites
run: |
sudo DEBIAN_FRONTEND=noninteractive apt-get update
Expand All @@ -185,7 +192,7 @@ jobs:
run: |
mkdir -p "artifacts/$LOGS_ARTIFACT_NAME"; cp -r .tox/*/log "artifacts/$LOGS_ARTIFACT_NAME"
if: always()
- uses: actions/upload-artifact@v1
- uses: actions/upload-artifact@v3
with:
path: artifacts
name: ${{ env.LOGS_ARTIFACT_NAME }}
Expand Down
47 changes: 12 additions & 35 deletions .github/workflows/ci-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,25 +42,21 @@ jobs:
# python3_xcode is only accepted if enough packages are available from the system
# --> to test "minimal", we would need https://trac.sagemath.org/ticket/30949
tox_env: [homebrew-macos-usrlocal-minimal, homebrew-macos-usrlocal-standard, homebrew-macos-usrlocal-maximal, homebrew-macos-usrlocal-python3_xcode-standard, conda-forge-macos-minimal, conda-forge-macos-standard, conda-forge-macos-maximal]
# As of 2021-12, default xcode
# - on macos-10.15: 12.4
# - on macos-latest (= macos-11): 13.1
# https://github.com/actions/virtual-environments/blob/main/images/macos/macos-10.15-Readme.md#xcode
xcode_version_factor: [default]
os: [ macos-10.15, macos-latest ]
os: [ macos-11, macos-12 ]
env:
TOX_ENV: local-${{ matrix.tox_env }}
LOCAL_ARTIFACT_NAME: sage-local-commit-${{ github.sha }}-tox-local-${{ matrix.tox_env }}-${{ matrix.os }}-xcode_${{ matrix.xcode_version_factor }}
LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-local-${{ matrix.tox_env }}--${{ matrix.os }}-xcode_${{ matrix.xcode_version_factor }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Select Xcode version
run: |
if [ ${{ matrix.xcode_version_factor }} != default ]; then sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode_version_factor }}.app; fi
- name: Install test prerequisites
run: |
brew install tox
- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v3
with:
path: sage-local-artifact
name: ${{ env.LOCAL_ARTIFACT_NAME }}
Expand Down Expand Up @@ -96,7 +92,7 @@ jobs:
run: |
mkdir -p "artifacts/$LOGS_ARTIFACT_NAME"; cp -r .tox/*/log "artifacts/$LOGS_ARTIFACT_NAME"
if: always()
- uses: actions/upload-artifact@v1
- uses: actions/upload-artifact@v3
with:
path: artifacts
name: ${{ env.LOGS_ARTIFACT_NAME }}
Expand All @@ -114,7 +110,7 @@ jobs:
run: |
mkdir -p sage-local-artifact && (cd .tox/$TOX_ENV && rm -f "local/lib64" && tar -cf - $(pwd)) > sage-local-artifact/sage-${{ env.TOX_ENV }}-${{ matrix.stage }}.tar
if: contains(matrix.stage, '1')
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
with:
path: sage-local-artifact/sage-${{ env.TOX_ENV }}-${{ matrix.stage }}.tar
name: ${{ env.LOCAL_ARTIFACT_NAME }}
Expand All @@ -124,7 +120,7 @@ jobs:

runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
fetch-depth: 500
- name: fetch tags
Expand All @@ -144,7 +140,7 @@ jobs:
- name: make dist
run: |
./configure --enable-download-from-upstream-url && make dist
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
with:
path: "dist/*.tar.gz"
name: dist
Expand All @@ -158,29 +154,17 @@ jobs:
fail-fast: false
max-parallel: 4
matrix:
os: [ macos-10.15, macos-11.0 ]
tox_system_factor: [macos-nobootstrap, macos-nobootstrap-python3_pythonorg]
os: [ macos-11, macos-12 ]
tox_system_factor: [macos-nobootstrap]
tox_packages_factor: [minimal]
# As of 2021-03, default is 12.4
# https://github.com/actions/virtual-environments/blob/main/images/macos/macos-10.15-Readme.md#xcode
xcode_version_factor: [default]
include:
# Test xcode 11.7 only on macos-10.15
- tox_system_factor: macos-nobootstrap
tox_packages_factor: minimal
xcode_version_factor: 11.7
os: macos-10.15
- tox_system_factor: macos-nobootstrap-python3_pythonorg
tox_packages_factor: minimal
xcode_version_factor: 11.7
os: macos-10.15
env:
TOX_ENV: local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}-xcode_${{ matrix.xcode_version_factor }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
if: "!contains(matrix.tox_system_factor, 'nobootstrap')"
- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v3
with:
path: .
name: dist
Expand All @@ -198,13 +182,6 @@ jobs:
- name: Install test prerequisites
run: |
sudo /usr/bin/python3 -m pip install tox
- name: Install python3 from python.org
# As of 2020-03-30 (https://github.com/actions/virtual-environments/blob/master/images/macos/macos-10.15-Readme.md),
# Python 3.7.7 is installed on GitHub Actions runners. But we install our own copy from the python.org binary package.
run: |
curl -o python3.pkg https://www.python.org/ftp/python/3.7.7/python-3.7.7-macosx10.9.pkg
sudo installer -verbose -pkg python3.pkg -target /
if: contains(matrix.tox_system_factor, 'python3_pythonorg')
- name: Build and test with tox
# We use a high parallelization on purpose in order to catch possible parallelization bugs in the build scripts.
# For doctesting, we use a lower parallelization to avoid timeouts.
Expand All @@ -214,7 +191,7 @@ jobs:
run: |
mkdir -p "artifacts/$LOGS_ARTIFACT_NAME"; cp -r .tox/*/log "artifacts/$LOGS_ARTIFACT_NAME"
if: always()
- uses: actions/upload-artifact@v1
- uses: actions/upload-artifact@v3
with:
path: artifacts
name: ${{ env.LOGS_ARTIFACT_NAME }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-wsl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
steps:
- name: Configure git
run: git config --global core.symlinks true
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Install Ubuntu 20.04 (in WSL)
run: |
(New-Object System.Net.WebClient).DownloadFile("https://aka.ms/wslubuntu2004", "Ubuntu.appx")
Expand All @@ -44,7 +44,7 @@ jobs:
run: mkdir -p "artifacts/logs"; cp -r .tox/*/log "artifacts/logs"
shell: bash
if: always()
- uses: actions/upload-artifact@v1
- uses: actions/upload-artifact@v3
with:
path: artifacts
name: logs
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/cygwin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,14 @@ jobs:
choco install git python39 python39-pip --source cygwin
- name: Check out SageMath
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
repository: ${{ inputs.sage_repo }}
ref: ${{ inputs.sage_ref }}
fetch-depth: 2000

- name: Check out git-trac-command
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
repository: sagemath/git-trac-command
path: git-trac-command
Expand All @@ -95,7 +95,7 @@ jobs:
if: inputs.sage_trac_git != ''

- name: Download upstream artifact
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
with:
path: upstream
name: ${{ inputs.upstream_artifact }}
Expand All @@ -106,7 +106,7 @@ jobs:
if: inputs.upstream_artifact

- name: Download sage-local artifact
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
with:
name: ${{ env.LOCAL_ARTIFACT_NAME }}
path: C:\\tools\\cygwin\\tmp
Expand All @@ -124,7 +124,7 @@ jobs:
run: |
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && mkdir -p "artifacts/$LOGS_ARTIFACT_NAME"; for a in "${{ env.SAGE_LOCAL }}"/var/tmp/sage/build/*; do if [ -d "$a" ]; then tar -c --remove-files -f "artifacts/$LOGS_ARTIFACT_NAME/"$(basename "$a")".tar" "$a"; fi; done; cp -r logs/* "artifacts/$LOGS_ARTIFACT_NAME"'
if: always()
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
with:
path: artifacts
name: ${{ env.LOGS_ARTIFACT_NAME }}
Expand All @@ -142,7 +142,7 @@ jobs:
run: |
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && rm -f "${{ env.SAGE_LOCAL }}"/lib64; tar -cf /tmp/sage-local-${{ inputs.stage }}.tar --listed-incremental=/tmp/sage-local.snar "${{ env.SAGE_LOCAL }}"'
if: always()
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
# upload-artifact@v2 does not support whitespace in file names.
# so we tar up the directory ourselves
with:
Expand Down
23 changes: 12 additions & 11 deletions .github/workflows/dist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ jobs:

release_dist:

# This job, in contrast to "dist" in tox.yml,
# does not use "configure --enable-download-from-upstream-url".
# This job, in contrast to "dist" in ci-macos.yml,
# does not use "configure --enable-download-from-upstream-url"
# (the default since #32390).
#
# In this way, we check that all necessary package tarballs
# have already been uploaded to the Sage server at the time
Expand All @@ -31,15 +32,15 @@ jobs:

runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Install bootstrap prerequisites
run: |
sudo DEBIAN_FRONTEND=noninteractive apt-get update
sudo DEBIAN_FRONTEND=noninteractive apt-get install $(build/bin/sage-get-system-packages debian _bootstrap)
- name: make dist
run: |
./bootstrap -D && ./configure && make dist
- uses: actions/upload-artifact@v2
./bootstrap -D && ./configure --disable-download-from-upstream-url && make dist
- uses: actions/upload-artifact@v3
with:
path: "dist/*.tar.gz"
name: release_dist
Expand All @@ -50,7 +51,7 @@ jobs:
env:
CAN_DEPLOY: ${{ secrets.SAGEMATH_PYPI_API_TOKEN != '' }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Install bootstrap prerequisites
run: |
sudo DEBIAN_FRONTEND=noninteractive apt-get update
Expand All @@ -62,7 +63,7 @@ jobs:
make pypi-sdists V=0
(mkdir dist && mv upstream/sage*.tar.gz dist/)
ls -l dist
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
with:
path: "dist/*.tar.gz"
name: dist
Expand Down Expand Up @@ -105,9 +106,9 @@ jobs:
# Use 'build', not 'pip wheel'
CIBW_BUILD_FRONTEND: build
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v3
with:
name: dist
path: dist
Expand All @@ -130,7 +131,7 @@ jobs:
pipx run cibuildwheel==2.7.0 unpacked/$pkg*
done
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
with:
name: wheels
path: ./wheelhouse/*.whl
Expand All @@ -142,7 +143,7 @@ jobs:
CAN_DEPLOY: ${{ secrets.SAGEMATH_PYPI_API_TOKEN != '' }}
steps:

- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v3
with:
name: wheels
path: wheelhouse
Expand Down
Loading

0 comments on commit 100b39c

Please sign in to comment.