Skip to content

Commit e9e97fa

Browse files
yyyyx4yyyyx4
committed
Merge tag '9.7.beta1' into public/33244
SageMath version 9.7.beta1, Release Date: 2022-05-26
2 parents e0be782 + 5fb2a6e commit e9e97fa

File tree

757 files changed

+17098
-10442
lines changed

Some content is hidden

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

757 files changed

+17098
-10442
lines changed

‎.github/workflows/build.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,16 @@ jobs:
2424
node-version: '12'
2525

2626
- name: Install pyright
27-
run: npm install -g pyright
27+
# Fix to v232 due to bug https://github.com/microsoft/pyright/issues/3239
28+
run: npm install -g [email protected]
2829

2930
- name: Prepare
3031
run: |
3132
# Reuse built SAGE_LOCAL contained in the Docker image
3233
./bootstrap
33-
./configure --enable-build-as-root --prefix=/sage/local --with-sage-venv --enable-editable
34+
./configure --enable-build-as-root --prefix=/sage/local --with-sage-venv --enable-editable --enable-download-from-upstream-url
3435
# Install test tools
3536
apt-get install -y git
36-
./sage -python -m pip install coverage
3737
3838
- name: Static code check with pyright
3939
run: pyright
@@ -45,7 +45,9 @@ jobs:
4545
SAGE_NUM_THREADS: 2
4646

4747
- name: Test
48-
run: ../sage -python -m coverage run ./bin/sage-runtests --all -p2
48+
run: |
49+
../sage -python -m pip install coverage
50+
../sage -python -m coverage run ./bin/sage-runtests --all -p2
4951
working-directory: ./src
5052

5153
- name: Prepare coverage results

‎.github/workflows/ci-conda.yml

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,8 @@ jobs:
4343
bash ~/miniconda.sh -b -p $HOME/miniconda
4444
echo "CONDA=$HOME/miniconda" >> $GITHUB_ENV
4545
46-
- name: Install bootstrap prerequisites
47-
run: |
48-
export PATH="$(pwd)/build/bin:$PATH"
49-
SYSTEM=$(sage-guess-package-system)
50-
eval $(sage-print-system-package-command $SYSTEM --sudo install $(sage-get-system-packages $SYSTEM _bootstrap))
51-
52-
# Create conda environment file
53-
- name: Bootstrap
54-
run: ./bootstrap
46+
- name: Create conda environment files
47+
run: ./bootstrap-conda
5548

5649
- name: Cache conda packages
5750
uses: actions/cache@v2
@@ -80,6 +73,7 @@ jobs:
8073
shell: bash -l {0}
8174
continue-on-error: true
8275
run: |
76+
./bootstrap
8377
echo "::add-matcher::.github/workflows/configure-systempackage-problem-matcher.json"
8478
./configure --enable-build-as-root --with-python=$CONDA_PREFIX/bin/python --prefix=$CONDA_PREFIX $(for pkg in $(./sage -package list :standard: --has-file spkg-configure.m4 --has-file distros/conda.txt); do echo --with-system-$pkg=force; done)
8579
echo "::remove-matcher owner=configure-system-package-warning::"
@@ -88,8 +82,8 @@ jobs:
8882
- name: Build
8983
shell: bash -l {0}
9084
run: |
91-
pip install --no-build-isolation -v -v -e pkgs/sage-conf pkgs/sage-setup
92-
pip install --no-build-isolation -v -v -e src
85+
pip install --no-build-isolation -v -v -e ./pkgs/sage-conf ./pkgs/sage-setup
86+
pip install --no-build-isolation -v -v -e ./src
9387
env:
9488
SAGE_NUM_THREADS: 2
9589

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

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@ jobs:
4343
shell: bash {0}
4444
run: |
4545
choco --version
46-
PACKAGES="python38 python38-pip"
46+
PACKAGES="python39 python39-pip"
4747
choco install $PACKAGES --source cygwin
4848
- name: tox
4949
run: |
5050
C:\\tools\\cygwin\\bin\\bash -l -x -c 'cat /proc/cpuinfo'
51-
C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.8 -m pip install tox'
51+
C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.9 -m pip install tox'
5252
C:\\tools\\cygwin\\bin\\bash -l -x -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && PREFIX="${{ env.SAGE_LOCAL }}" tox -e local-cygwin-choco-${{ matrix.pkgs }} -- $TARGETS'
5353
- name: Prepare logs artifact
5454
shell: bash
@@ -103,12 +103,12 @@ jobs:
103103
shell: bash {0}
104104
run: |
105105
choco --version
106-
PACKAGES="python38 python38-pip"
106+
PACKAGES="python39 python39-pip"
107107
choco install $PACKAGES --source cygwin
108108
- name: tox
109109
run: |
110110
C:\\tools\\cygwin\\bin\\bash -l -x -c 'cat /proc/cpuinfo'
111-
C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.8 -m pip install tox'
111+
C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.9 -m pip install tox'
112112
C:\\tools\\cygwin\\bin\\bash -l -x -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && PREFIX="${{ env.SAGE_LOCAL }}" tox -e local-cygwin-choco-${{ matrix.pkgs }} -- $TARGETS'
113113
- name: Prepare logs artifact
114114
shell: bash
@@ -168,7 +168,7 @@ jobs:
168168
shell: bash {0}
169169
run: |
170170
choco --version
171-
PACKAGES="python38 python38-pip"
171+
PACKAGES="python39 python39-pip"
172172
choco install $PACKAGES --source cygwin
173173
- uses: actions/download-artifact@v2
174174
with:
@@ -180,7 +180,7 @@ jobs:
180180
- name: tox
181181
run: |
182182
C:\\tools\\cygwin\\bin\\bash -l -x -c 'cat /proc/cpuinfo'
183-
C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.8 -m pip install tox'
183+
C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.9 -m pip install tox'
184184
C:\\tools\\cygwin\\bin\\bash -l -x -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && PREFIX="${{ env.SAGE_LOCAL }}" tox -e local-cygwin-choco-${{ matrix.pkgs }} -- $TARGETS'
185185
- name: Prepare logs artifact
186186
shell: bash
@@ -238,7 +238,7 @@ jobs:
238238
shell: bash {0}
239239
run: |
240240
choco --version
241-
PACKAGES="python38 python38-pip"
241+
PACKAGES="python39 python39-pip"
242242
choco install $PACKAGES --source cygwin
243243
- uses: actions/download-artifact@v2
244244
with:
@@ -250,7 +250,7 @@ jobs:
250250
- name: tox
251251
run: |
252252
C:\\tools\\cygwin\\bin\\bash -l -x -c 'cat /proc/cpuinfo'
253-
C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.8 -m pip install tox'
253+
C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.9 -m pip install tox'
254254
C:\\tools\\cygwin\\bin\\bash -l -x -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && PREFIX="${{ env.SAGE_LOCAL }}" tox -e local-cygwin-choco-${{ matrix.pkgs }} -- $TARGETS'
255255
- name: Prepare logs artifact
256256
shell: bash
@@ -306,7 +306,7 @@ jobs:
306306
shell: bash {0}
307307
run: |
308308
choco --version
309-
PACKAGES="python38 python38-pip"
309+
PACKAGES="python39 python39-pip"
310310
choco install $PACKAGES --source cygwin
311311
- uses: actions/download-artifact@v2
312312
with:
@@ -318,7 +318,7 @@ jobs:
318318
- name: tox
319319
run: |
320320
C:\\tools\\cygwin\\bin\\bash -l -x -c 'cat /proc/cpuinfo'
321-
C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.8 -m pip install tox'
321+
C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.9 -m pip install tox'
322322
C:\\tools\\cygwin\\bin\\bash -l -x -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && PREFIX="${{ env.SAGE_LOCAL }}" tox -e local-cygwin-choco-${{ matrix.pkgs }} -- $TARGETS'
323323
- name: Prepare logs artifact
324324
shell: bash
@@ -353,7 +353,7 @@ jobs:
353353
env:
354354
STAGE: ii-d
355355
PREVIOUS_STAGES: i-*
356-
TARGETS: ipython ipywidgets notebook thebe
356+
TARGETS: ipython ipywidgets notebook
357357
LOCAL_ARTIFACT_NAME: sage-local-commit-${{ github.sha }}-cygwin-${{ matrix.pkgs }}
358358
LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-cygwin-${{ matrix.pkgs }}
359359

@@ -374,7 +374,7 @@ jobs:
374374
shell: bash {0}
375375
run: |
376376
choco --version
377-
PACKAGES="python38 python38-pip"
377+
PACKAGES="python39 python39-pip"
378378
choco install $PACKAGES --source cygwin
379379
- uses: actions/download-artifact@v2
380380
with:
@@ -386,7 +386,7 @@ jobs:
386386
- name: tox
387387
run: |
388388
C:\\tools\\cygwin\\bin\\bash -l -x -c 'cat /proc/cpuinfo'
389-
C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.8 -m pip install tox'
389+
C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.9 -m pip install tox'
390390
C:\\tools\\cygwin\\bin\\bash -l -x -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && PREFIX="${{ env.SAGE_LOCAL }}" tox -e local-cygwin-choco-${{ matrix.pkgs }} -- $TARGETS'
391391
- name: Prepare logs artifact
392392
shell: bash
@@ -442,7 +442,7 @@ jobs:
442442
shell: bash {0}
443443
run: |
444444
choco --version
445-
PACKAGES="python38 python38-pip"
445+
PACKAGES="python39 python39-pip"
446446
choco install $PACKAGES --source cygwin
447447
- uses: actions/download-artifact@v2
448448
with:
@@ -454,7 +454,7 @@ jobs:
454454
- name: tox
455455
run: |
456456
C:\\tools\\cygwin\\bin\\bash -l -x -c 'cat /proc/cpuinfo'
457-
C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.8 -m pip install tox'
457+
C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.9 -m pip install tox'
458458
C:\\tools\\cygwin\\bin\\bash -l -x -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && PREFIX="${{ env.SAGE_LOCAL }}" tox -e local-cygwin-choco-${{ matrix.pkgs }} -- $TARGETS'
459459
- name: Prepare logs artifact
460460
shell: bash
@@ -514,7 +514,7 @@ jobs:
514514
shell: bash {0}
515515
run: |
516516
choco --version
517-
PACKAGES="python38 python38-pip"
517+
PACKAGES="python39 python39-pip"
518518
choco install $PACKAGES --source cygwin
519519
- uses: actions/download-artifact@v2
520520
with:
@@ -526,7 +526,7 @@ jobs:
526526
- name: tox
527527
run: |
528528
C:\\tools\\cygwin\\bin\\bash -l -x -c 'cat /proc/cpuinfo'
529-
C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.8 -m pip install tox'
529+
C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.9 -m pip install tox'
530530
C:\\tools\\cygwin\\bin\\bash -l -x -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && PREFIX="${{ env.SAGE_LOCAL }}" tox -e local-cygwin-choco-${{ matrix.pkgs }} -- $TARGETS'
531531
- name: Prepare logs artifact
532532
shell: bash
@@ -586,7 +586,7 @@ jobs:
586586
shell: bash {0}
587587
run: |
588588
choco --version
589-
PACKAGES="python38 python38-pip"
589+
PACKAGES="python39 python39-pip"
590590
choco install $PACKAGES --source cygwin
591591
- uses: actions/download-artifact@v2
592592
with:
@@ -598,7 +598,7 @@ jobs:
598598
- name: tox
599599
run: |
600600
C:\\tools\\cygwin\\bin\\bash -l -x -c 'cat /proc/cpuinfo'
601-
C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.8 -m pip install tox'
601+
C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.9 -m pip install tox'
602602
C:\\tools\\cygwin\\bin\\bash -l -x -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && PREFIX="${{ env.SAGE_LOCAL }}" tox -e local-cygwin-choco-${{ matrix.pkgs }} -- $TARGETS'
603603
- name: Prepare logs artifact
604604
shell: bash
@@ -658,7 +658,7 @@ jobs:
658658
shell: bash {0}
659659
run: |
660660
choco --version
661-
PACKAGES="python38 python38-pip"
661+
PACKAGES="python39 python39-pip"
662662
choco install $PACKAGES --source cygwin
663663
- uses: actions/download-artifact@v2
664664
with:
@@ -670,7 +670,7 @@ jobs:
670670
- name: tox
671671
run: |
672672
C:\\tools\\cygwin\\bin\\bash -l -x -c 'cat /proc/cpuinfo'
673-
C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.8 -m pip install tox'
673+
C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.9 -m pip install tox'
674674
C:\\tools\\cygwin\\bin\\bash -l -x -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && PREFIX="${{ env.SAGE_LOCAL }}" tox -e local-cygwin-choco-${{ matrix.pkgs }} -- $TARGETS'
675675
- name: Prepare logs artifact
676676
shell: bash
@@ -728,7 +728,7 @@ jobs:
728728
shell: bash {0}
729729
run: |
730730
choco --version
731-
PACKAGES="python38 python38-pip"
731+
PACKAGES="python39 python39-pip"
732732
choco install $PACKAGES --source cygwin
733733
- uses: actions/download-artifact@v2
734734
with:
@@ -740,7 +740,7 @@ jobs:
740740
- name: tox
741741
run: |
742742
C:\\tools\\cygwin\\bin\\bash -l -x -c 'cat /proc/cpuinfo'
743-
C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.8 -m pip install tox'
743+
C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.9 -m pip install tox'
744744
C:\\tools\\cygwin\\bin\\bash -l -x -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && PREFIX="${{ env.SAGE_LOCAL }}" tox -e local-cygwin-choco-${{ matrix.pkgs }} -- $TARGETS'
745745
- name: Prepare logs artifact
746746
shell: bash
@@ -796,7 +796,7 @@ jobs:
796796
shell: bash {0}
797797
run: |
798798
choco --version
799-
PACKAGES="python38 python38-pip"
799+
PACKAGES="python39 python39-pip"
800800
choco install $PACKAGES --source cygwin
801801
- uses: actions/download-artifact@v2
802802
with:
@@ -808,7 +808,7 @@ jobs:
808808
- name: tox
809809
run: |
810810
C:\\tools\\cygwin\\bin\\bash -l -x -c 'cat /proc/cpuinfo'
811-
C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.8 -m pip install tox'
811+
C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.9 -m pip install tox'
812812
C:\\tools\\cygwin\\bin\\bash -l -x -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && PREFIX="${{ env.SAGE_LOCAL }}" tox -e local-cygwin-choco-${{ matrix.pkgs }} -- $TARGETS'
813813
- name: Prepare logs artifact
814814
shell: bash
@@ -864,7 +864,7 @@ jobs:
864864
shell: bash {0}
865865
run: |
866866
choco --version
867-
PACKAGES="python38 python38-pip"
867+
PACKAGES="python39 python39-pip"
868868
choco install $PACKAGES --source cygwin
869869
- uses: actions/download-artifact@v2
870870
with:
@@ -876,7 +876,7 @@ jobs:
876876
- name: tox
877877
run: |
878878
C:\\tools\\cygwin\\bin\\bash -l -x -c 'cat /proc/cpuinfo'
879-
C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.8 -m pip install tox'
879+
C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.9 -m pip install tox'
880880
C:\\tools\\cygwin\\bin\\bash -l -x -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && PREFIX="${{ env.SAGE_LOCAL }}" tox -e local-cygwin-choco-${{ matrix.pkgs }} -- $TARGETS'
881881
- name: Prepare logs artifact
882882
shell: bash
@@ -932,7 +932,7 @@ jobs:
932932
shell: bash {0}
933933
run: |
934934
choco --version
935-
PACKAGES="python38 python38-pip"
935+
PACKAGES="python39 python39-pip"
936936
choco install $PACKAGES --source cygwin
937937
- uses: actions/download-artifact@v2
938938
with:
@@ -944,7 +944,7 @@ jobs:
944944
- name: tox
945945
run: |
946946
C:\\tools\\cygwin\\bin\\bash -l -x -c 'cat /proc/cpuinfo'
947-
C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.8 -m pip install tox'
947+
C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.9 -m pip install tox'
948948
C:\\tools\\cygwin\\bin\\bash -l -x -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && PREFIX="${{ env.SAGE_LOCAL }}" tox -e local-cygwin-choco-${{ matrix.pkgs }} -- $TARGETS'
949949
- name: Prepare logs artifact
950950
shell: bash
@@ -1000,7 +1000,7 @@ jobs:
10001000
shell: bash {0}
10011001
run: |
10021002
choco --version
1003-
PACKAGES="python38 python38-pip"
1003+
PACKAGES="python39 python39-pip"
10041004
choco install $PACKAGES --source cygwin
10051005
- uses: actions/download-artifact@v2
10061006
with:
@@ -1012,7 +1012,7 @@ jobs:
10121012
- name: tox
10131013
run: |
10141014
C:\\tools\\cygwin\\bin\\bash -l -x -c 'cat /proc/cpuinfo'
1015-
C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.8 -m pip install tox'
1015+
C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.9 -m pip install tox'
10161016
C:\\tools\\cygwin\\bin\\bash -l -x -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && PREFIX="${{ env.SAGE_LOCAL }}" tox -e local-cygwin-choco-${{ matrix.pkgs }} -- $TARGETS'
10171017
- name: Prepare logs artifact
10181018
shell: bash

0 commit comments

Comments
 (0)