Skip to content

Commit 01d4cdc

Browse files
author
Matthias Koeppe
committed
Merge tag '9.8.beta6' into t/21003/pyscipopt
SageMath version 9.8.beta6, Release Date: 2022-12-21
2 parents 7b19413 + 2114066 commit 01d4cdc

File tree

417 files changed

+5369
-3617
lines changed

Some content is hidden

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

417 files changed

+5369
-3617
lines changed

‎.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
steps:
2727
- name: Checkout
2828
id: checkout
29-
uses: actions/checkout@v2
29+
uses: actions/checkout@v3
3030

3131
- name: Prepare
3232
id: prepare
@@ -55,7 +55,7 @@ jobs:
5555

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

‎.github/workflows/ci-conda.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
conda-env: [environment, environment-optional]
3030

3131
steps:
32-
- uses: actions/checkout@v2
32+
- uses: actions/checkout@v3
3333

3434
- name: Check for Miniconda
3535
id: check_conda

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

Lines changed: 1044 additions & 0 deletions
Large diffs are not rendered by default.

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,13 @@ jobs:
6161
needs: [cygwin-stage-i-a, cygwin-stage-i-b]
6262

6363
cygwin-stage-ii-e:
64-
uses: ./.github/workflows/cygwin.yml
65-
with:
66-
stage: ii-e
67-
previous_stages: i-*
68-
targets: threejs tachyon pillow jmol m4rie sympy lrcalc lcalc symmetrica cliquer libbraiding planarity rw elliptic_curves combinatorial_designs zn_poly sympow
64+
env:
65+
STAGE: ii-e
66+
PREVIOUS_STAGES: i-*
67+
TARGETS: threejs tachyon pillow jmol m4rie sympy lrcalc lcalc symmetrica cliquer libbraiding planarity rw elliptic_curves combinatorial_designs sympow
68+
LOCAL_ARTIFACT_NAME: sage-local-commit-${{ github.sha }}-cygwin-${{ matrix.pkgs }}
69+
LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-cygwin-${{ matrix.pkgs }}
70+
6971
needs: [cygwin-stage-i-a, cygwin-stage-i-b]
7072

7173
############################################## stage-iii ##########################################

‎.github/workflows/ci-linux.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ jobs:
178178
TOX_ENV: local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
179179
LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
180180
steps:
181-
- uses: actions/checkout@v2
181+
- uses: actions/checkout@v3
182182
- name: Install test prerequisites
183183
run: |
184184
sudo DEBIAN_FRONTEND=noninteractive apt-get update
@@ -192,7 +192,7 @@ jobs:
192192
run: |
193193
mkdir -p "artifacts/$LOGS_ARTIFACT_NAME"; cp -r .tox/*/log "artifacts/$LOGS_ARTIFACT_NAME"
194194
if: always()
195-
- uses: actions/upload-artifact@v1
195+
- uses: actions/upload-artifact@v3
196196
with:
197197
path: artifacts
198198
name: ${{ env.LOGS_ARTIFACT_NAME }}

‎.github/workflows/ci-macos.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,14 @@ jobs:
4949
LOCAL_ARTIFACT_NAME: sage-local-commit-${{ github.sha }}-tox-local-${{ matrix.tox_env }}-${{ matrix.os }}-xcode_${{ matrix.xcode_version_factor }}
5050
LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-local-${{ matrix.tox_env }}--${{ matrix.os }}-xcode_${{ matrix.xcode_version_factor }}
5151
steps:
52-
- uses: actions/checkout@v2
52+
- uses: actions/checkout@v3
5353
- name: Select Xcode version
5454
run: |
5555
if [ ${{ matrix.xcode_version_factor }} != default ]; then sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode_version_factor }}.app; fi
5656
- name: Install test prerequisites
5757
run: |
5858
brew install tox
59-
- uses: actions/download-artifact@v2
59+
- uses: actions/download-artifact@v3
6060
with:
6161
path: sage-local-artifact
6262
name: ${{ env.LOCAL_ARTIFACT_NAME }}
@@ -92,7 +92,7 @@ jobs:
9292
run: |
9393
mkdir -p "artifacts/$LOGS_ARTIFACT_NAME"; cp -r .tox/*/log "artifacts/$LOGS_ARTIFACT_NAME"
9494
if: always()
95-
- uses: actions/upload-artifact@v1
95+
- uses: actions/upload-artifact@v3
9696
with:
9797
path: artifacts
9898
name: ${{ env.LOGS_ARTIFACT_NAME }}
@@ -110,7 +110,7 @@ jobs:
110110
run: |
111111
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
112112
if: contains(matrix.stage, '1')
113-
- uses: actions/upload-artifact@v2
113+
- uses: actions/upload-artifact@v3
114114
with:
115115
path: sage-local-artifact/sage-${{ env.TOX_ENV }}-${{ matrix.stage }}.tar
116116
name: ${{ env.LOCAL_ARTIFACT_NAME }}
@@ -120,7 +120,7 @@ jobs:
120120

121121
runs-on: ubuntu-latest
122122
steps:
123-
- uses: actions/checkout@v2
123+
- uses: actions/checkout@v3
124124
with:
125125
fetch-depth: 500
126126
- name: fetch tags
@@ -140,7 +140,7 @@ jobs:
140140
- name: make dist
141141
run: |
142142
./configure --enable-download-from-upstream-url && make dist
143-
- uses: actions/upload-artifact@v2
143+
- uses: actions/upload-artifact@v3
144144
with:
145145
path: "dist/*.tar.gz"
146146
name: dist
@@ -162,9 +162,9 @@ jobs:
162162
TOX_ENV: local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
163163
LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}-xcode_${{ matrix.xcode_version_factor }}
164164
steps:
165-
- uses: actions/checkout@v2
165+
- uses: actions/checkout@v3
166166
if: "!contains(matrix.tox_system_factor, 'nobootstrap')"
167-
- uses: actions/download-artifact@v2
167+
- uses: actions/download-artifact@v3
168168
with:
169169
path: .
170170
name: dist
@@ -191,7 +191,7 @@ jobs:
191191
run: |
192192
mkdir -p "artifacts/$LOGS_ARTIFACT_NAME"; cp -r .tox/*/log "artifacts/$LOGS_ARTIFACT_NAME"
193193
if: always()
194-
- uses: actions/upload-artifact@v1
194+
- uses: actions/upload-artifact@v3
195195
with:
196196
path: artifacts
197197
name: ${{ env.LOGS_ARTIFACT_NAME }}

‎.github/workflows/ci-wsl.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
steps:
2020
- name: Configure git
2121
run: git config --global core.symlinks true
22-
- uses: actions/checkout@v2
22+
- uses: actions/checkout@v3
2323
- name: Install Ubuntu 20.04 (in WSL)
2424
run: |
2525
(New-Object System.Net.WebClient).DownloadFile("https://aka.ms/wslubuntu2004", "Ubuntu.appx")
@@ -44,7 +44,7 @@ jobs:
4444
run: mkdir -p "artifacts/logs"; cp -r .tox/*/log "artifacts/logs"
4545
shell: bash
4646
if: always()
47-
- uses: actions/upload-artifact@v1
47+
- uses: actions/upload-artifact@v3
4848
with:
4949
path: artifacts
5050
name: logs

‎.github/workflows/cygwin.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,14 +73,14 @@ jobs:
7373
choco install git python39 python39-pip --source cygwin
7474
7575
- name: Check out SageMath
76-
uses: actions/checkout@v2
76+
uses: actions/checkout@v3
7777
with:
7878
repository: ${{ inputs.sage_repo }}
7979
ref: ${{ inputs.sage_ref }}
8080
fetch-depth: 2000
8181

8282
- name: Check out git-trac-command
83-
uses: actions/checkout@v2
83+
uses: actions/checkout@v3
8484
with:
8585
repository: sagemath/git-trac-command
8686
path: git-trac-command
@@ -95,7 +95,7 @@ jobs:
9595
if: inputs.sage_trac_git != ''
9696

9797
- name: Download upstream artifact
98-
uses: actions/download-artifact@v2
98+
uses: actions/download-artifact@v3
9999
with:
100100
path: upstream
101101
name: ${{ inputs.upstream_artifact }}
@@ -106,7 +106,7 @@ jobs:
106106
if: inputs.upstream_artifact
107107

108108
- name: Download sage-local artifact
109-
uses: actions/download-artifact@v2
109+
uses: actions/download-artifact@v3
110110
with:
111111
name: ${{ env.LOCAL_ARTIFACT_NAME }}
112112
path: C:\\tools\\cygwin\\tmp
@@ -124,7 +124,7 @@ jobs:
124124
run: |
125125
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"'
126126
if: always()
127-
- uses: actions/upload-artifact@v2
127+
- uses: actions/upload-artifact@v3
128128
with:
129129
path: artifacts
130130
name: ${{ env.LOGS_ARTIFACT_NAME }}
@@ -142,7 +142,7 @@ jobs:
142142
run: |
143143
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 }}"'
144144
if: always()
145-
- uses: actions/upload-artifact@v2
145+
- uses: actions/upload-artifact@v3
146146
# upload-artifact@v2 does not support whitespace in file names.
147147
# so we tar up the directory ourselves
148148
with:

‎.github/workflows/dist.yml

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@ jobs:
1818

1919
release_dist:
2020

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

3233
runs-on: ubuntu-latest
3334
steps:
34-
- uses: actions/checkout@v2
35+
- uses: actions/checkout@v3
3536
- name: Install bootstrap prerequisites
3637
run: |
3738
sudo DEBIAN_FRONTEND=noninteractive apt-get update
3839
sudo DEBIAN_FRONTEND=noninteractive apt-get install $(build/bin/sage-get-system-packages debian _bootstrap)
3940
- name: make dist
4041
run: |
41-
./bootstrap -D && ./configure && make dist
42-
- uses: actions/upload-artifact@v2
42+
./bootstrap -D && ./configure --disable-download-from-upstream-url && make dist
43+
- uses: actions/upload-artifact@v3
4344
with:
4445
path: "dist/*.tar.gz"
4546
name: release_dist
@@ -50,7 +51,7 @@ jobs:
5051
env:
5152
CAN_DEPLOY: ${{ secrets.SAGEMATH_PYPI_API_TOKEN != '' }}
5253
steps:
53-
- uses: actions/checkout@v2
54+
- uses: actions/checkout@v3
5455
- name: Install bootstrap prerequisites
5556
run: |
5657
sudo DEBIAN_FRONTEND=noninteractive apt-get update
@@ -62,7 +63,7 @@ jobs:
6263
make pypi-sdists V=0
6364
(mkdir dist && mv upstream/sage*.tar.gz dist/)
6465
ls -l dist
65-
- uses: actions/upload-artifact@v2
66+
- uses: actions/upload-artifact@v3
6667
with:
6768
path: "dist/*.tar.gz"
6869
name: dist
@@ -105,9 +106,9 @@ jobs:
105106
# Use 'build', not 'pip wheel'
106107
CIBW_BUILD_FRONTEND: build
107108
steps:
108-
- uses: actions/checkout@v2
109+
- uses: actions/checkout@v3
109110

110-
- uses: actions/download-artifact@v2
111+
- uses: actions/download-artifact@v3
111112
with:
112113
name: dist
113114
path: dist
@@ -130,7 +131,7 @@ jobs:
130131
pipx run cibuildwheel==2.7.0 unpacked/$pkg*
131132
done
132133
133-
- uses: actions/upload-artifact@v2
134+
- uses: actions/upload-artifact@v3
134135
with:
135136
name: wheels
136137
path: ./wheelhouse/*.whl
@@ -142,7 +143,7 @@ jobs:
142143
CAN_DEPLOY: ${{ secrets.SAGEMATH_PYPI_API_TOKEN != '' }}
143144
steps:
144145

145-
- uses: actions/download-artifact@v2
146+
- uses: actions/download-artifact@v3
146147
with:
147148
name: wheels
148149
path: wheelhouse

‎.github/workflows/doc-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
if: github.repository == 'sagemath/sagetrac-mirror'
1818
steps:
1919
- name: Checkout
20-
uses: actions/checkout@v2
20+
uses: actions/checkout@v3
2121

2222
- name: Prepare
2323
run: |

0 commit comments

Comments
 (0)