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

Commit 5748c21

Browse files
author
Matthias Koeppe
committed
Merge tag '9.7.beta1' into t/33739/public/build/conda_gitpod
SageMath version 9.7.beta1, Release Date: 2022-05-26
2 parents 2b9ef5a + 5fb2a6e commit 5748c21

File tree

464 files changed

+9618
-5871
lines changed

Some content is hidden

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

464 files changed

+9618
-5871
lines changed

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
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
@@ -108,7 +108,7 @@ jobs:
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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
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
@@ -108,7 +108,7 @@ jobs:
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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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

‎.lgtm.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ queries:
66
path_classifiers:
77
imports_only:
88
- "**/all.py"
9+
- "**/all_*.py"
910
- "**/*catalog*.py"
1011
- "**/species/library.py"
1112
- "**/categories/basic.py"

‎.vscode/launch.json‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,17 @@
11
{
22
"version": "0.2.0",
33
"configurations": [
4+
{
5+
"name": "Sage: Pytest",
6+
"type": "python",
7+
"request": "launch",
8+
"module": "pytest",
9+
"args": [
10+
"${file}"
11+
],
12+
"console": "integratedTerminal",
13+
"justMyCode": false
14+
},
415
{
516
"name": "Python: Current File",
617
"type": "python",
@@ -22,4 +33,4 @@
2233
"justMyCode": false
2334
}
2435
],
25-
}
36+
}

‎.vscode/settings.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@
1616
},
1717
"python.testing.pytestEnabled": true,
1818
"python.testing.pytestArgs": [
19-
"src"
19+
"--rootdir=src/sage",
20+
"-c=src/tox.ini",
21+
"--doctest-modules",
2022
],
2123
"python.testing.unittestEnabled": false,
2224
"python.linting.pycodestyleEnabled": true,

‎.zenodo.json‎

Lines changed: 4 additions & 4 deletions
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.6",
5-
"version": "9.6",
4+
"title": "sagemath/sage: 9.7.beta1",
5+
"version": "9.7.beta1",
66
"upload_type": "software",
7-
"publication_date": "2022-05-15",
7+
"publication_date": "2022-05-26",
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.6",
18+
"identifier": "https://github.com/sagemath/sage/tree/9.7.beta1",
1919
"relation": "isSupplementTo"
2020
},
2121
{

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ micro_release:
197197
@echo "Removing unnecessary files & directories - make will not be functional afterwards anymore"
198198
@# We keep src/sage for some doctests that it expect it to be there and
199199
@# also because it does not add any weight with rdfind below.
200-
@# We need src/sage/bin/ for the scripts that invoke Sage
200+
@# We need src/bin/ for the scripts that invoke Sage
201201
@# We need sage, the script to start Sage
202202
@# We need local/, the dependencies and the built Sage library itself.
203203
@# We keep VERSION.txt.

‎README.md‎

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -413,15 +413,18 @@ in the Installation Guide.
413413
get a list by typing `./sage --optional` or by visiting the
414414
[packages documentation page](https://doc.sagemath.org/html/en/reference/spkg/).
415415

416-
18. Optional: Create a symlink to the `sage` executable somewhere in your
417-
`PATH`, so you can start Sage by typing `sage` from anywhere rather
418-
than having to either type the full path or navigate to the Sage
416+
18. Optional: Create a symlink to the installed `sage` script in a
417+
directory in your `PATH`, for example ``/usr/local``. This will
418+
allow you to start Sage by typing `sage` from anywhere rather than
419+
having to either type the full path or navigate to the Sage
419420
directory and type `./sage`. This can be done by running:
420421

421-
$ ln -s $HOME/sage/sage-x.y/sage /usr/local/bin
422+
$ sudo ln -s $(./sage -sh -c 'ls $SAGE_ROOT/venv/bin/sage') /usr/local/bin
422423

423-
The `$HOME/sage/sage-x.y/` part may need adapting. One way to decide
424-
how to adapt it is to run `print(SAGE_ROOT)` in a Sage session.
424+
19. Optional: Set up SageMath as a Jupyter kernel in an existing Jupyter notebook
425+
or JupyterLab installation, as described in [section
426+
"Launching SageMath"](https://doc.sagemath.org/html/en/installation/launching.html)
427+
in the installation manual.
425428

426429
Troubleshooting
427430
---------------
@@ -580,17 +583,10 @@ Relocation
580583

581584
It is not supported to move the `SAGE_ROOT` or `SAGE_LOCAL` directory
582585
after building Sage. If you do move the directories, you will have to
583-
build Sage again from scratch.
584-
585-
If you copy the `sage` script or make a symbolic link to it, you
586-
should modify the script to reflect this (as instructed at the top of
587-
the script). It is important that the path to Sage does not have any
588-
spaces and non-ASCII characters in it.
586+
run ``make distclean`` and build Sage again from scratch.
589587

590588
For a system-wide installation, you have to build Sage as a "normal" user
591-
and then as root you can change permissions. Afterwards, you need to start up
592-
Sage as root at least once prior to using the system-wide Sage as a
593-
normal user. See the [Installation Guide](https://doc.sagemath.org/html/en/installation/source.html#installation-in-a-multiuser-environment)
589+
and then as root you can change permissions. See the [Installation Guide](https://doc.sagemath.org/html/en/installation/source.html#installation-in-a-multiuser-environment)
594590
for further information.
595591

596592
Redistribution

‎VERSION.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SageMath version 9.6, Release Date: 2022-05-15
1+
SageMath version 9.7.beta1, Release Date: 2022-05-26

0 commit comments

Comments
 (0)