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

Commit b82d660

Browse files
author
Matthias Koeppe
committed
Merge tag '9.8.beta5' into t/32601/modularization_of_sagelib__break_out_a_separate_package_sagemath_standard_no_symbolics
SageMath version 9.8.beta5, Release Date: 2022-12-11
2 parents b102b12 + bb7ee85 commit b82d660

File tree

207 files changed

+3004
-1638
lines changed

Some content is hidden

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

207 files changed

+3004
-1638
lines changed

.github/workflows/build.yml

+2-2
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

+1-1
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-linux.yml

+2-2
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

+9-9
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

+2-2
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

+6-6
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

+8-8
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ jobs:
3131

3232
runs-on: ubuntu-latest
3333
steps:
34-
- uses: actions/checkout@v2
34+
- uses: actions/checkout@v3
3535
- name: Install bootstrap prerequisites
3636
run: |
3737
sudo DEBIAN_FRONTEND=noninteractive apt-get update
3838
sudo DEBIAN_FRONTEND=noninteractive apt-get install $(build/bin/sage-get-system-packages debian _bootstrap)
3939
- name: make dist
4040
run: |
4141
./bootstrap -D && ./configure && make dist
42-
- uses: actions/upload-artifact@v2
42+
- uses: actions/upload-artifact@v3
4343
with:
4444
path: "dist/*.tar.gz"
4545
name: release_dist
@@ -50,7 +50,7 @@ jobs:
5050
env:
5151
CAN_DEPLOY: ${{ secrets.SAGEMATH_PYPI_API_TOKEN != '' }}
5252
steps:
53-
- uses: actions/checkout@v2
53+
- uses: actions/checkout@v3
5454
- name: Install bootstrap prerequisites
5555
run: |
5656
sudo DEBIAN_FRONTEND=noninteractive apt-get update
@@ -62,7 +62,7 @@ jobs:
6262
make pypi-sdists V=0
6363
(mkdir dist && mv upstream/sage*.tar.gz dist/)
6464
ls -l dist
65-
- uses: actions/upload-artifact@v2
65+
- uses: actions/upload-artifact@v3
6666
with:
6767
path: "dist/*.tar.gz"
6868
name: dist
@@ -105,9 +105,9 @@ jobs:
105105
# Use 'build', not 'pip wheel'
106106
CIBW_BUILD_FRONTEND: build
107107
steps:
108-
- uses: actions/checkout@v2
108+
- uses: actions/checkout@v3
109109

110-
- uses: actions/download-artifact@v2
110+
- uses: actions/download-artifact@v3
111111
with:
112112
name: dist
113113
path: dist
@@ -130,7 +130,7 @@ jobs:
130130
pipx run cibuildwheel==2.7.0 unpacked/$pkg*
131131
done
132132
133-
- uses: actions/upload-artifact@v2
133+
- uses: actions/upload-artifact@v3
134134
with:
135135
name: wheels
136136
path: ./wheelhouse/*.whl
@@ -142,7 +142,7 @@ jobs:
142142
CAN_DEPLOY: ${{ secrets.SAGEMATH_PYPI_API_TOKEN != '' }}
143143
steps:
144144

145-
- uses: actions/download-artifact@v2
145+
- uses: actions/download-artifact@v3
146146
with:
147147
name: wheels
148148
path: wheelhouse

.github/workflows/doc-build.yml

+1-1
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: |

.github/workflows/docker.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ jobs:
138138
EXTRA_SAGE_PACKAGES: ${{ inputs.extra_sage_packages }}
139139
steps:
140140
- name: Check out SageMath
141-
uses: actions/checkout@v2
141+
uses: actions/checkout@v3
142142
with:
143143
repository: ${{ inputs.sage_repo }}
144144
ref: ${{ inputs.sage_ref }}
@@ -158,7 +158,7 @@ jobs:
158158
df -h
159159
if: inputs.free_disk_space
160160
- name: Check out git-trac-command
161-
uses: actions/checkout@v2
161+
uses: actions/checkout@v3
162162
with:
163163
repository: sagemath/git-trac-command
164164
path: git-trac-command
@@ -173,7 +173,7 @@ jobs:
173173
if: inputs.sage_trac_git != ''
174174

175175
- name: Download upstream artifact
176-
uses: actions/download-artifact@v2
176+
uses: actions/download-artifact@v3
177177
with:
178178
path: upstream
179179
name: ${{ inputs.upstream_artifact }}
@@ -225,7 +225,7 @@ jobs:
225225
if [ -f .tox/$TOX_ENV/Dockertags ]; then CONTAINERS=$(docker create $(tail -1 .tox/$TOX_ENV/Dockertags) /bin/bash || true); fi
226226
if [ -n "$CONTAINERS" ]; then for CONTAINER in $CONTAINERS; do for ARTIFACT in /sage/logs; do docker cp $CONTAINER:$ARTIFACT artifacts/$LOGS_ARTIFACT_NAME && HAVE_LOG=1; done; if [ -n "$HAVE_LOG" ]; then break; fi; done; fi
227227
if: always()
228-
- uses: actions/upload-artifact@v2
228+
- uses: actions/upload-artifact@v3
229229
with:
230230
path: artifacts
231231
name: ${{ env.LOGS_ARTIFACT_NAME }}

.github/workflows/lint.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Checkout
16-
uses: actions/checkout@v2
16+
uses: actions/checkout@v3
1717
- name: Set up Python
18-
uses: actions/setup-python@v2
18+
uses: actions/setup-python@v4
1919
with:
2020
python-version: 3.8
2121
- name: Install pycodestyle
@@ -27,9 +27,9 @@ jobs:
2727
runs-on: ubuntu-latest
2828
steps:
2929
- name: Checkout
30-
uses: actions/checkout@v2
30+
uses: actions/checkout@v3
3131
- name: Set up Python
32-
uses: actions/setup-python@v2
32+
uses: actions/setup-python@v4
3333
with:
3434
python-version: 3.8
3535
- name: Install relint
@@ -41,9 +41,9 @@ jobs:
4141
runs-on: ubuntu-latest
4242
steps:
4343
- name: Checkout
44-
uses: actions/checkout@v2
44+
uses: actions/checkout@v3
4545
- name: Set up Python
46-
uses: actions/setup-python@v2
46+
uses: actions/setup-python@v4
4747
with:
4848
python-version: 3.8
4949
- name: Install tox

.zenodo.json

+4-4
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.8.beta4",
5-
"version": "9.8.beta4",
4+
"title": "sagemath/sage: 9.8.beta5",
5+
"version": "9.8.beta5",
66
"upload_type": "software",
7-
"publication_date": "2022-11-21",
7+
"publication_date": "2022-12-11",
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.8.beta4",
18+
"identifier": "https://github.com/sagemath/sage/tree/9.8.beta5",
1919
"relation": "isSupplementTo"
2020
},
2121
{

VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SageMath version 9.8.beta4, Release Date: 2022-11-21
1+
SageMath version 9.8.beta5, Release Date: 2022-12-11

build/pkgs/configure/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=configure-VERSION.tar.gz
2-
sha1=013bfce4d1d0d0d68553c4025647445b7036f4db
3-
md5=a429cd9c90d6bd90f7b2254b7fed8669
4-
cksum=1487098037
2+
sha1=cd10867f6ee013a5f7fcfa6c9c69b1aed1939399
3+
md5=dbbcb33cd3ea96259a902cdffad84ab9
4+
cksum=423684136
+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
03f68f4aa9602d246824f764e2ea328fa52577c7
1+
325b7c119c0cf14948e6052709a814bcd6e3f477

build/pkgs/contourpy/SPKG.rst

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
contourpy: Python library for calculating contours of 2D quadrilateral grids
2+
============================================================================
3+
4+
Description
5+
-----------
6+
7+
Python library for calculating contours of 2D quadrilateral grids
8+
9+
License
10+
-------
11+
12+
BSD-3-Clause
13+
14+
Upstream Contact
15+
----------------
16+
17+
https://pypi.org/project/contourpy/
18+

build/pkgs/contourpy/checksums.ini

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
tarball=contourpy-VERSION.tar.gz
2+
sha1=f8dac7a79be96e2b8f085f79ba386dba54e99e99
3+
md5=0ed85863802b1323708b400ae7e7bbd7
4+
cksum=2680473500
5+
upstream_url=https://pypi.io/packages/source/c/contourpy/contourpy-VERSION.tar.gz

0 commit comments

Comments
 (0)