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.6' into public/scalar_elliptic_curve_endomorphisms
Browse files Browse the repository at this point in the history
SageMath version 9.6, Release Date: 2022-05-15
  • Loading branch information
yyyyx4 committed May 17, 2022
2 parents 48afa78 + bf6aeb9 commit 38b8626
Show file tree
Hide file tree
Showing 87 changed files with 958 additions and 651 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,9 @@ jobs:
run: |
# Reuse built SAGE_LOCAL contained in the Docker image
./bootstrap
./configure --enable-build-as-root --prefix=/sage/local --with-sage-venv --enable-editable
./configure --enable-build-as-root --prefix=/sage/local --with-sage-venv --enable-editable --enable-download-from-upstream-url
# Install test tools
apt-get install -y git
./sage -python -m pip install coverage
- name: Static code check with pyright
run: pyright
Expand All @@ -46,7 +45,9 @@ jobs:
SAGE_NUM_THREADS: 2

- name: Test
run: ../sage -python -m coverage run ./bin/sage-runtests --all -p2
run: |
../sage -python -m pip install coverage
../sage -python -m coverage run ./bin/sage-runtests --all -p2
working-directory: ./src

- name: Prepare coverage results
Expand Down
30 changes: 15 additions & 15 deletions .github/workflows/ci-cygwin-minimal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
shell: bash {0}
run: |
choco --version
PACKAGES="python38 python38-pip"
PACKAGES="python39 python39-pip"
choco install $PACKAGES --source cygwin
- name: tox
run: |
Expand Down Expand Up @@ -103,7 +103,7 @@ jobs:
shell: bash {0}
run: |
choco --version
PACKAGES="python38 python38-pip"
PACKAGES="python39 python39-pip"
choco install $PACKAGES --source cygwin
- name: tox
run: |
Expand Down Expand Up @@ -168,7 +168,7 @@ jobs:
shell: bash {0}
run: |
choco --version
PACKAGES="python38 python38-pip"
PACKAGES="python39 python39-pip"
choco install $PACKAGES --source cygwin
- uses: actions/download-artifact@v2
with:
Expand Down Expand Up @@ -238,7 +238,7 @@ jobs:
shell: bash {0}
run: |
choco --version
PACKAGES="python38 python38-pip"
PACKAGES="python39 python39-pip"
choco install $PACKAGES --source cygwin
- uses: actions/download-artifact@v2
with:
Expand Down Expand Up @@ -306,7 +306,7 @@ jobs:
shell: bash {0}
run: |
choco --version
PACKAGES="python38 python38-pip"
PACKAGES="python39 python39-pip"
choco install $PACKAGES --source cygwin
- uses: actions/download-artifact@v2
with:
Expand Down Expand Up @@ -374,7 +374,7 @@ jobs:
shell: bash {0}
run: |
choco --version
PACKAGES="python38 python38-pip"
PACKAGES="python39 python39-pip"
choco install $PACKAGES --source cygwin
- uses: actions/download-artifact@v2
with:
Expand Down Expand Up @@ -442,7 +442,7 @@ jobs:
shell: bash {0}
run: |
choco --version
PACKAGES="python38 python38-pip"
PACKAGES="python39 python39-pip"
choco install $PACKAGES --source cygwin
- uses: actions/download-artifact@v2
with:
Expand Down Expand Up @@ -514,7 +514,7 @@ jobs:
shell: bash {0}
run: |
choco --version
PACKAGES="python38 python38-pip"
PACKAGES="python39 python39-pip"
choco install $PACKAGES --source cygwin
- uses: actions/download-artifact@v2
with:
Expand Down Expand Up @@ -586,7 +586,7 @@ jobs:
shell: bash {0}
run: |
choco --version
PACKAGES="python38 python38-pip"
PACKAGES="python39 python39-pip"
choco install $PACKAGES --source cygwin
- uses: actions/download-artifact@v2
with:
Expand Down Expand Up @@ -658,7 +658,7 @@ jobs:
shell: bash {0}
run: |
choco --version
PACKAGES="python38 python38-pip"
PACKAGES="python39 python39-pip"
choco install $PACKAGES --source cygwin
- uses: actions/download-artifact@v2
with:
Expand Down Expand Up @@ -728,7 +728,7 @@ jobs:
shell: bash {0}
run: |
choco --version
PACKAGES="python38 python38-pip"
PACKAGES="python39 python39-pip"
choco install $PACKAGES --source cygwin
- uses: actions/download-artifact@v2
with:
Expand Down Expand Up @@ -796,7 +796,7 @@ jobs:
shell: bash {0}
run: |
choco --version
PACKAGES="python38 python38-pip"
PACKAGES="python39 python39-pip"
choco install $PACKAGES --source cygwin
- uses: actions/download-artifact@v2
with:
Expand Down Expand Up @@ -864,7 +864,7 @@ jobs:
shell: bash {0}
run: |
choco --version
PACKAGES="python38 python38-pip"
PACKAGES="python39 python39-pip"
choco install $PACKAGES --source cygwin
- uses: actions/download-artifact@v2
with:
Expand Down Expand Up @@ -932,7 +932,7 @@ jobs:
shell: bash {0}
run: |
choco --version
PACKAGES="python38 python38-pip"
PACKAGES="python39 python39-pip"
choco install $PACKAGES --source cygwin
- uses: actions/download-artifact@v2
with:
Expand Down Expand Up @@ -1000,7 +1000,7 @@ jobs:
shell: bash {0}
run: |
choco --version
PACKAGES="python38 python38-pip"
PACKAGES="python39 python39-pip"
choco install $PACKAGES --source cygwin
- uses: actions/download-artifact@v2
with:
Expand Down
30 changes: 15 additions & 15 deletions .github/workflows/ci-cygwin-standard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
shell: bash {0}
run: |
choco --version
PACKAGES="python38 python38-pip"
PACKAGES="python39 python39-pip"
choco install $PACKAGES --source cygwin
- name: tox
run: |
Expand Down Expand Up @@ -103,7 +103,7 @@ jobs:
shell: bash {0}
run: |
choco --version
PACKAGES="python38 python38-pip"
PACKAGES="python39 python39-pip"
choco install $PACKAGES --source cygwin
- name: tox
run: |
Expand Down Expand Up @@ -168,7 +168,7 @@ jobs:
shell: bash {0}
run: |
choco --version
PACKAGES="python38 python38-pip"
PACKAGES="python39 python39-pip"
choco install $PACKAGES --source cygwin
- uses: actions/download-artifact@v2
with:
Expand Down Expand Up @@ -238,7 +238,7 @@ jobs:
shell: bash {0}
run: |
choco --version
PACKAGES="python38 python38-pip"
PACKAGES="python39 python39-pip"
choco install $PACKAGES --source cygwin
- uses: actions/download-artifact@v2
with:
Expand Down Expand Up @@ -306,7 +306,7 @@ jobs:
shell: bash {0}
run: |
choco --version
PACKAGES="python38 python38-pip"
PACKAGES="python39 python39-pip"
choco install $PACKAGES --source cygwin
- uses: actions/download-artifact@v2
with:
Expand Down Expand Up @@ -374,7 +374,7 @@ jobs:
shell: bash {0}
run: |
choco --version
PACKAGES="python38 python38-pip"
PACKAGES="python39 python39-pip"
choco install $PACKAGES --source cygwin
- uses: actions/download-artifact@v2
with:
Expand Down Expand Up @@ -442,7 +442,7 @@ jobs:
shell: bash {0}
run: |
choco --version
PACKAGES="python38 python38-pip"
PACKAGES="python39 python39-pip"
choco install $PACKAGES --source cygwin
- uses: actions/download-artifact@v2
with:
Expand Down Expand Up @@ -514,7 +514,7 @@ jobs:
shell: bash {0}
run: |
choco --version
PACKAGES="python38 python38-pip"
PACKAGES="python39 python39-pip"
choco install $PACKAGES --source cygwin
- uses: actions/download-artifact@v2
with:
Expand Down Expand Up @@ -586,7 +586,7 @@ jobs:
shell: bash {0}
run: |
choco --version
PACKAGES="python38 python38-pip"
PACKAGES="python39 python39-pip"
choco install $PACKAGES --source cygwin
- uses: actions/download-artifact@v2
with:
Expand Down Expand Up @@ -658,7 +658,7 @@ jobs:
shell: bash {0}
run: |
choco --version
PACKAGES="python38 python38-pip"
PACKAGES="python39 python39-pip"
choco install $PACKAGES --source cygwin
- uses: actions/download-artifact@v2
with:
Expand Down Expand Up @@ -728,7 +728,7 @@ jobs:
shell: bash {0}
run: |
choco --version
PACKAGES="python38 python38-pip"
PACKAGES="python39 python39-pip"
choco install $PACKAGES --source cygwin
- uses: actions/download-artifact@v2
with:
Expand Down Expand Up @@ -796,7 +796,7 @@ jobs:
shell: bash {0}
run: |
choco --version
PACKAGES="python38 python38-pip"
PACKAGES="python39 python39-pip"
choco install $PACKAGES --source cygwin
- uses: actions/download-artifact@v2
with:
Expand Down Expand Up @@ -864,7 +864,7 @@ jobs:
shell: bash {0}
run: |
choco --version
PACKAGES="python38 python38-pip"
PACKAGES="python39 python39-pip"
choco install $PACKAGES --source cygwin
- uses: actions/download-artifact@v2
with:
Expand Down Expand Up @@ -932,7 +932,7 @@ jobs:
shell: bash {0}
run: |
choco --version
PACKAGES="python38 python38-pip"
PACKAGES="python39 python39-pip"
choco install $PACKAGES --source cygwin
- uses: actions/download-artifact@v2
with:
Expand Down Expand Up @@ -1000,7 +1000,7 @@ jobs:
shell: bash {0}
run: |
choco --version
PACKAGES="python38 python38-pip"
PACKAGES="python39 python39-pip"
choco install $PACKAGES --source cygwin
- uses: actions/download-artifact@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/doc-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
run: |
# Reuse built SAGE_LOCAL contained in the Docker image
./bootstrap
./configure --enable-build-as-root --prefix=/sage/local --with-sage-venv
./configure --enable-build-as-root --prefix=/sage/local --with-sage-venv --enable-download-from-upstream-url
- name: Build
run: make doc-html
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -169,12 +169,12 @@ jobs:
2-optional*) export TARGETS_PRE="build/make/Makefile" TARGETS="build/make/Makefile"
targets_pattern="${{ matrix.stage }}"
targets_pattern="${targets_pattern#2-optional-}"
export TARGETS_OPTIONAL=$( echo $(export PATH=build/bin:$PATH && (for a in spkg-install.in spkg-install requirements.txt; do sage-package list :optional: --has-file $a --no-file huge --no-file has_nonfree_dependencies; done) | grep -v ^_ | grep -v sagemath_doc | grep '^[${{ matrix.targets_pattern }}]' ) )
export TARGETS_OPTIONAL=$( echo $(export PATH=build/bin:$PATH && (for a in spkg-install.in spkg-install requirements.txt; do sage-package list :optional: --has-file $a --no-file huge --no-file has_nonfree_dependencies; done) | grep -v ^_ | grep -v sagemath_doc | grep "^[$targets_pattern]" ) )
;;
2-experimental*) export TARGETS_PRE="build/make/Makefile" TARGETS="build/make/Makefile"
targets_pattern="${{ matrix.stage }}"
targets_pattern="${targets_pattern#2-experimental-}"
export TARGETS_OPTIONAL=$( echo $(export PATH=build/bin:$PATH && (for a in spkg-install.in spkg-install requirements.txt; do sage-package list :experimental: --has-file $a --no-file huge --no-file has_nonfree_dependencies; done) | grep -v ^_ | grep -v sagemath_doc | grep '^[${{ matrix.targets_pattern }}]' ) )
export TARGETS_OPTIONAL=$( echo $(export PATH=build/bin:$PATH && (for a in spkg-install.in spkg-install requirements.txt; do sage-package list :experimental: --has-file $a --no-file huge --no-file has_nonfree_dependencies; done) | grep -v ^_ | grep -v sagemath_doc | grep "^[$targets_pattern]" ) )
;;
esac
MAKE="make -j12" tox -e $TOX_ENV -- SAGE_NUM_THREADS=4 $TARGETS
Expand Down
12 changes: 12 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,18 @@
"program": "${file}",
"console": "integratedTerminal",
"justMyCode": false
},
{
"name": "Sage: Test",
"type": "python",
"request": "launch",
"program": "${workspaceFolder}/src/bin/sage-runtests",
"args": [
"--verbose",
"${file}"
],
"console": "integratedTerminal",
"justMyCode": false
}
],
}
8 changes: 4 additions & 4 deletions .zenodo.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"description": "Mirror of the Sage https://sagemath.org/ source tree",
"license": "other-open",
"title": "sagemath/sage: 9.6.rc1",
"version": "9.6.rc1",
"title": "sagemath/sage: 9.6",
"version": "9.6",
"upload_type": "software",
"publication_date": "2022-04-19",
"publication_date": "2022-05-15",
"creators": [
{
"affiliation": "SageMath.org",
Expand All @@ -15,7 +15,7 @@
"related_identifiers": [
{
"scheme": "url",
"identifier": "https://github.com/sagemath/sage/tree/9.6.rc1",
"identifier": "https://github.com/sagemath/sage/tree/9.6",
"relation": "isSupplementTo"
},
{
Expand Down
Loading

0 comments on commit 38b8626

Please sign in to comment.