Skip to content

Commit 44406e3

Browse files
committed
Merge branch 'develop' into quasimodform_implement_basis_of_weight
2 parents 1b8df53 + 27b077e commit 44406e3

File tree

1,108 files changed

+42551
-119232
lines changed

Some content is hidden

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

1,108 files changed

+42551
-119232
lines changed

.codecov.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# https://docs.codecov.com/docs/pull-request-comments#disable-comment
2+
comment: false
3+
# https://docs.codecov.com/docs/codecovyml-reference#codecov
4+
codecov:
5+
require_ci_to_pass: false
6+
# https://docs.codecov.com/docs/commit-status
7+
coverage:
8+
status:
9+
project:
10+
default:
11+
target: auto
12+
threshold: 0%
13+
base: auto
14+
patch:
15+
default:
16+
target: auto
17+
threshold: 0%
18+
base: auto

.devcontainer/portability-Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ ARG SYSTEM_FACTOR="ubuntu-jammy"
55
ARG PACKAGE_FACTOR="standard"
66
ARG DOCKER_TARGET="with-system-packages"
77
ARG DOCKER_TAG="dev"
8-
FROM ghcr.io/sagemath/sage/sage-docker-${SYSTEM_FACTOR}-${PACKAGE_FACTOR}-${DOCKER_TARGET}:${DOCKER_TAG}
8+
FROM ghcr.io/sagemath/sage/sage-${SYSTEM_FACTOR}-${PACKAGE_FACTOR}-${DOCKER_TARGET}:${DOCKER_TAG}

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
1-
<!-- ^^^^^
2-
Please provide a concise, informative and self-explanatory title.
3-
Don't put issue numbers in there, do this in the PR body below.
4-
For example, instead of "Fixes #1234" use "Introduce new method to calculate 1+1"
5-
-->
6-
### 📚 Description
1+
<!-- Please provide a concise, informative and self-explanatory title. -->
2+
<!-- Don't put issue numbers in the title. Put it in the Description below. -->
3+
<!-- For example, instead of "Fixes #12345", use "Add a new method to multiply two integers" -->
4+
5+
### :books: Description
76

8-
<!-- Describe your changes here in detail -->
7+
<!-- Describe your changes here in detail. -->
98
<!-- Why is this change required? What problem does it solve? -->
10-
<!-- If it resolves an open issue, please link to the issue here. For example "Closes #1337" -->
9+
<!-- If this PR resolves an open issue, please link to it here. For example "Fixes #12345". -->
10+
<!-- If your change requires a documentation PR, please link it appropriately. -->
1111

12-
### 📝 Checklist
12+
### :memo: Checklist
1313

14-
<!-- Put an `x` in all the boxes that apply. -->
15-
<!-- If your change requires a documentation PR, please link it appropriately -->
16-
<!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
14+
<!-- Put an `x` in all the boxes that apply. It should be `[x]` not `[x ]`. -->
1715

18-
- [ ] I have made sure that the title is self-explanatory and the description concisely explains the PR.
19-
- [ ] I have linked an issue or discussion.
16+
- [ ] The title is concise, informative, and self-explanatory.
17+
- [ ] The description explains in detail what this PR is about.
18+
- [ ] I have linked a relevant issue or discussion.
2019
- [ ] I have created tests covering the changes.
2120
- [ ] I have updated the documentation accordingly.
2221

23-
### Dependencies
24-
<!-- List all open pull requests that this PR logically depends on -->
25-
<!--
26-
- #xyz: short description why this is a dependency
27-
- #abc: ...
22+
### :hourglass: Dependencies
23+
24+
<!-- List all open PRs that this PR logically depends on
25+
- #12345: short description why this is a dependency
26+
- #34567: ...
2827
-->
2928

29+
<!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ concurrency:
2323
jobs:
2424
build:
2525
runs-on: ubuntu-latest
26-
container: ghcr.io/sagemath/sage/sage-docker-${{ github.event.inputs.platform || 'ubuntu-focal-standard' }}-with-targets:${{ github.event.inputs.docker_tag || 'dev'}}
26+
container: ghcr.io/sagemath/sage/sage-${{ github.event.inputs.platform || 'ubuntu-focal-standard' }}-with-targets:${{ github.event.inputs.docker_tag || 'dev'}}
2727
steps:
2828
- name: Checkout
2929
id: checkout
@@ -103,6 +103,6 @@ jobs:
103103
104104
- name: Upload coverage to codecov
105105
if: always() && steps.build.outcome == 'success'
106-
uses: codecov/codecov-action@v2
106+
uses: codecov/codecov-action@v3
107107
with:
108108
files: ./coverage.xml

.github/workflows/ci-conda.yml

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ on:
66
- '*'
77
branches:
88
- 'public/build/**-runci'
9+
pull_request:
10+
types:
11+
- labeled
912
workflow_dispatch:
1013
# Allow to run manually
1114

@@ -19,11 +22,18 @@ jobs:
1922
name: Conda
2023
runs-on: ${{ matrix.os }}
2124

25+
# Run on push, workflow dispatch and when certain labels are added
26+
if: |
27+
github.event.action != 'labeled' ||
28+
github.event.label.name == 'c: packages: optional' ||
29+
github.event.label.name == 'c: packages: standard' ||
30+
github.event.label.name == 's: run conda ci'
31+
2232
strategy:
2333
fail-fast: false
2434
matrix:
2535
os: [ubuntu-latest, macos-latest]
26-
python: [3.8, 3.9]
36+
python: ['3.9', '3.10', '3.11']
2737
conda-env: [environment, environment-optional]
2838

2939
steps:
@@ -41,11 +51,18 @@ jobs:
4151
bash ~/miniconda.sh -b -p $HOME/miniconda
4252
echo "CONDA=$HOME/miniconda" >> $GITHUB_ENV
4353
54+
# Workaround for https://github.com/actions/runner-images/issues/6910 / https://github.com/conda/conda/issues/12303
55+
- name: Downgrade conda
56+
if: matrix.os == 'ubuntu-latest'
57+
run: |
58+
conda config --set allow_conda_downgrades true
59+
conda install conda=4.12.0 -y
60+
4461
- name: Create conda environment files
4562
run: ./bootstrap-conda
4663

4764
- name: Cache conda packages
48-
uses: actions/cache@v2
65+
uses: actions/cache@v3
4966
with:
5067
path: ~/conda_pkgs_dir
5168
key:
@@ -77,13 +94,22 @@ jobs:
7794
echo "::remove-matcher owner=configure-system-package-warning::"
7895
echo "::remove-matcher owner=configure-system-package-error::"
7996
97+
# Manually install ptyprocess for now, until https://github.com/sagemath/sage/issues/32147 is fixed
98+
pip install --no-build-isolation -v -v ptyprocess==0.5.1
99+
80100
- name: Build
81101
shell: bash -l {0}
82102
run: |
83-
pip install --no-build-isolation -v -v -e ./pkgs/sage-conf ./pkgs/sage-setup
84-
pip install --no-build-isolation -v -v -e ./src
103+
# Use --no-deps and pip check below to verify that all necessary dependencies are installed via conda.
104+
pip install --no-build-isolation --no-deps -v -v -e ./pkgs/sage-conf ./pkgs/sage-setup
105+
pip install --no-build-isolation --no-deps -v -v -e ./src
85106
env:
86107
SAGE_NUM_THREADS: 2
108+
109+
- name: Verify dependencies
110+
if: always()
111+
shell: bash -l {0}
112+
run: pip check
87113

88114
- name: Test
89115
shell: bash -l {0}

.github/workflows/doc-build-pdf.yml

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
name: Build documentation (PDF)
2+
3+
on:
4+
pull_request:
5+
push:
6+
workflow_dispatch:
7+
# Allow to run manually
8+
9+
concurrency:
10+
# Cancel previous runs of this workflow for the same branch
11+
group: ${{ github.workflow }}-${{ github.ref }}
12+
cancel-in-progress: true
13+
14+
jobs:
15+
build-docs:
16+
runs-on: ubuntu-latest
17+
# Use "maximal" so that texlive is installed
18+
# Use "fedora-31" for build diversity
19+
container: ghcr.io/sagemath/sage/sage-docker-fedora-31-maximal-with-targets:dev
20+
steps:
21+
- name: Checkout
22+
uses: actions/checkout@v3
23+
24+
- name: Prepare
25+
run: |
26+
apt-get update && apt-get install -y zip
27+
# Reuse built SAGE_LOCAL contained in the Docker image
28+
./bootstrap
29+
./configure --enable-build-as-root --prefix=/sage/local --with-sage-venv --enable-download-from-upstream-url
30+
31+
- name: Build
32+
run: make build V=0 && make doc-pdf
33+
env:
34+
MAKE: make -j2
35+
SAGE_NUM_THREADS: 2
36+
TEXMFHOME: /sage/texmf
37+
38+
- name: Copy docs
39+
run: |
40+
# For some reason the deploy step below cannot find /sage/...
41+
# So copy everything from there to local folder
42+
mkdir -p ./docs
43+
cp -r -L /sage/local/share/doc/sage/pdf/en/* ./docs
44+
# Zip everything for increased performance
45+
zip -r docs-pdf.zip docs
46+
47+
- name: Upload docs
48+
uses: actions/upload-artifact@v3
49+
with:
50+
name: docs-pdf
51+
path: docs-pdf.zip

.github/workflows/doc-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ concurrency:
1414
jobs:
1515
build-docs:
1616
runs-on: ubuntu-latest
17-
container: ghcr.io/sagemath/sage/sage-docker-ubuntu-focal-standard-with-targets:dev
17+
container: ghcr.io/sagemath/sage/sage-ubuntu-focal-standard-with-targets:dev
1818
steps:
1919
- name: Checkout
2020
uses: actions/checkout@v3

.github/workflows/doc-publish.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,18 @@ jobs:
2828
# Once https://github.com/actions/download-artifact/issues/172 and/or https://github.com/actions/download-artifact/issues/60 is implemented, we can use the official download-artifact action
2929
# For now use the solution from https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#using-data-from-the-triggering-workflow
3030
- name: Download docs
31-
uses: actions/github-script@v3.1.0
31+
uses: actions/github-script@v6.4.0
3232
with:
3333
script: |
34-
var artifacts = await github.actions.listWorkflowRunArtifacts({
34+
var artifacts = await github.rest.actions.listWorkflowRunArtifacts({
3535
owner: context.repo.owner,
3636
repo: context.repo.repo,
3737
run_id: ${{github.event.workflow_run.id }},
3838
});
3939
var matchArtifact = artifacts.data.artifacts.filter((artifact) => {
4040
return artifact.name == "docs"
4141
})[0];
42-
var download = await github.actions.downloadArtifact({
42+
var download = await github.rest.actions.downloadArtifact({
4343
owner: context.repo.owner,
4444
repo: context.repo.repo,
4545
artifact_id: matchArtifact.id,

.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: 10.0.beta5",
5-
"version": "10.0.beta5",
4+
"title": "sagemath/sage: 10.0.beta8",
5+
"version": "10.0.beta8",
66
"upload_type": "software",
7-
"publication_date": "2023-03-19",
7+
"publication_date": "2023-04-06",
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/10.0.beta5",
18+
"identifier": "https://github.com/sagemath/sage/tree/10.0.beta8",
1919
"relation": "isSupplementTo"
2020
},
2121
{

README.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
<a href="https://sagemath.org"><img src="src/doc/common/themes/sage/static/logo_sagemath_black.svg" height="60" align="right" /></a>
1+
<a href="https://sagemath.org">
2+
<picture>
3+
<source media="(prefers-color-scheme: dark)" srcset="src/doc/common/static/logo_sagemath_white.svg">
4+
<img src="src/doc/common/static/logo_sagemath_black.svg" height="60" align="left">
5+
</picture>
6+
</a>
27

38
# Sage: Open Source Mathematical Software
49

0 commit comments

Comments
 (0)