Skip to content

Commit 325d1ea

Browse files
author
Matthias Köppe
authored
Merge branch 'develop' into sage_conf_pyproject_toml
2 parents 440486b + 15fcf52 commit 325d1ea

File tree

3,627 files changed

+8676
-4020
lines changed

Some content is hidden

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

3,627 files changed

+8676
-4020
lines changed

.devcontainer/portability-ubuntu-trusty-toolchain-gcc_9-minimal/devcontainer.json .devcontainer/portability-fedora-40-minimal/devcontainer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
// from .devcontainer/portability-devcontainer.json.in
44
// See https://aka.ms/devcontainer.json for format details.
55
{
6-
"name": "ubuntu-trusty-toolchain-gcc_9-minimal (≥ 8-core)",
6+
"name": "fedora-40-minimal (≥ 8-core)",
77
"build": {
88
"dockerfile": "portability-Dockerfile",
99
// See tox.ini for definitions
1010
"args": {
11-
"SYSTEM_FACTOR": "ubuntu-trusty-toolchain-gcc_9",
11+
"SYSTEM_FACTOR": "fedora-40",
1212
"PACKAGE_FACTOR": "minimal",
1313
"DOCKER_TARGET": "with-targets",
1414
"DOCKER_TAG": "dev"

.devcontainer/portability-ubuntu-trusty-toolchain-gcc_9-standard/devcontainer.json .devcontainer/portability-fedora-40-standard/devcontainer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
// from .devcontainer/portability-devcontainer.json.in
44
// See https://aka.ms/devcontainer.json for format details.
55
{
6-
"name": "ubuntu-trusty-toolchain-gcc_9-standard (≥ 8-core)",
6+
"name": "fedora-40-standard (≥ 8-core)",
77
"build": {
88
"dockerfile": "portability-Dockerfile",
99
// See tox.ini for definitions
1010
"args": {
11-
"SYSTEM_FACTOR": "ubuntu-trusty-toolchain-gcc_9",
11+
"SYSTEM_FACTOR": "fedora-40",
1212
"PACKAGE_FACTOR": "standard",
1313
"DOCKER_TARGET": "with-targets",
1414
"DOCKER_TAG": "dev"

.devcontainer/portability-opensuse-15.3-gcc_11-python3.9-minimal/devcontainer.json .devcontainer/portability-gentoo-python3.12-minimal/devcontainer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
// from .devcontainer/portability-devcontainer.json.in
44
// See https://aka.ms/devcontainer.json for format details.
55
{
6-
"name": "opensuse-15.3-gcc_11-python3.9-minimal (≥ 8-core)",
6+
"name": "gentoo-python3.12-minimal (≥ 8-core)",
77
"build": {
88
"dockerfile": "portability-Dockerfile",
99
// See tox.ini for definitions
1010
"args": {
11-
"SYSTEM_FACTOR": "opensuse-15.3-gcc_11-python3.9",
11+
"SYSTEM_FACTOR": "gentoo-python3.12",
1212
"PACKAGE_FACTOR": "minimal",
1313
"DOCKER_TARGET": "with-targets",
1414
"DOCKER_TAG": "dev"

.devcontainer/portability-opensuse-15.3-gcc_11-python3.9-standard/devcontainer.json .devcontainer/portability-gentoo-python3.12-standard/devcontainer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
// from .devcontainer/portability-devcontainer.json.in
44
// See https://aka.ms/devcontainer.json for format details.
55
{
6-
"name": "opensuse-15.3-gcc_11-python3.9-standard (≥ 8-core)",
6+
"name": "gentoo-python3.12-standard (≥ 8-core)",
77
"build": {
88
"dockerfile": "portability-Dockerfile",
99
// See tox.ini for definitions
1010
"args": {
11-
"SYSTEM_FACTOR": "opensuse-15.3-gcc_11-python3.9",
11+
"SYSTEM_FACTOR": "gentoo-python3.12",
1212
"PACKAGE_FACTOR": "standard",
1313
"DOCKER_TARGET": "with-targets",
1414
"DOCKER_TAG": "dev"

.devcontainer/portability-opensuse-15.4-gcc_11-python3.10-minimal/devcontainer.json .devcontainer/portability-linuxmint-21.3-minimal/devcontainer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
// from .devcontainer/portability-devcontainer.json.in
44
// See https://aka.ms/devcontainer.json for format details.
55
{
6-
"name": "opensuse-15.4-gcc_11-python3.10-minimal (≥ 8-core)",
6+
"name": "linuxmint-21.3-minimal (≥ 8-core)",
77
"build": {
88
"dockerfile": "portability-Dockerfile",
99
// See tox.ini for definitions
1010
"args": {
11-
"SYSTEM_FACTOR": "opensuse-15.4-gcc_11-python3.10",
11+
"SYSTEM_FACTOR": "linuxmint-21.3",
1212
"PACKAGE_FACTOR": "minimal",
1313
"DOCKER_TARGET": "with-targets",
1414
"DOCKER_TAG": "dev"

.devcontainer/portability-opensuse-15.4-gcc_11-python3.10-standard/devcontainer.json .devcontainer/portability-linuxmint-21.3-standard/devcontainer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
// from .devcontainer/portability-devcontainer.json.in
44
// See https://aka.ms/devcontainer.json for format details.
55
{
6-
"name": "opensuse-15.4-gcc_11-python3.10-standard (≥ 8-core)",
6+
"name": "linuxmint-21.3-standard (≥ 8-core)",
77
"build": {
88
"dockerfile": "portability-Dockerfile",
99
// See tox.ini for definitions
1010
"args": {
11-
"SYSTEM_FACTOR": "opensuse-15.4-gcc_11-python3.10",
11+
"SYSTEM_FACTOR": "linuxmint-21.3",
1212
"PACKAGE_FACTOR": "standard",
1313
"DOCKER_TARGET": "with-targets",
1414
"DOCKER_TAG": "dev"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
// The command "tox -e update_docker_platforms"
2+
// creates .devcontainer/portability-*-*/devcontainer.json
3+
// from .devcontainer/portability-devcontainer.json.in
4+
// See https://aka.ms/devcontainer.json for format details.
5+
{
6+
"name": "ubuntu-noble-minimal (≥ 8-core)",
7+
"build": {
8+
"dockerfile": "portability-Dockerfile",
9+
// See tox.ini for definitions
10+
"args": {
11+
"SYSTEM_FACTOR": "ubuntu-noble",
12+
"PACKAGE_FACTOR": "minimal",
13+
"DOCKER_TARGET": "with-targets",
14+
"DOCKER_TAG": "dev"
15+
}
16+
},
17+
"containerEnv": {
18+
"MAKE": "make -j4"
19+
},
20+
"onCreateCommand": ".devcontainer/onCreate.sh",
21+
"updateContentCommand": ".devcontainer/portability-updateContent.sh",
22+
"extensions": [
23+
"ms-python.python"
24+
]
25+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../portability-Dockerfile
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
// The command "tox -e update_docker_platforms"
2+
// creates .devcontainer/portability-*-*/devcontainer.json
3+
// from .devcontainer/portability-devcontainer.json.in
4+
// See https://aka.ms/devcontainer.json for format details.
5+
{
6+
"name": "ubuntu-noble-standard (≥ 8-core)",
7+
"build": {
8+
"dockerfile": "portability-Dockerfile",
9+
// See tox.ini for definitions
10+
"args": {
11+
"SYSTEM_FACTOR": "ubuntu-noble",
12+
"PACKAGE_FACTOR": "standard",
13+
"DOCKER_TARGET": "with-targets",
14+
"DOCKER_TAG": "dev"
15+
}
16+
},
17+
"containerEnv": {
18+
"MAKE": "make -j4"
19+
},
20+
"onCreateCommand": ".devcontainer/onCreate.sh",
21+
"updateContentCommand": ".devcontainer/portability-updateContent.sh",
22+
"extensions": [
23+
"ms-python.python"
24+
]
25+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../portability-Dockerfile

.github/PULL_REQUEST_TEMPLATE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
- [ ] The description explains in detail what this PR is about.
1616
- [ ] I have linked a relevant issue or discussion.
1717
- [ ] I have created tests covering the changes.
18-
- [ ] I have updated the documentation accordingly.
18+
- [ ] I have updated the documentation and checked the documentation preview.
1919

2020
### :hourglass: Dependencies
2121

.github/workflows/build.yml

+14-14
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ on:
1515
platform:
1616
description: 'Platform'
1717
required: true
18-
default: 'ubuntu-focal-standard'
18+
default: 'ubuntu-jammy-standard'
1919
docker_tag:
2020
description: 'Docker tag'
2121
required: true
@@ -52,7 +52,7 @@ jobs:
5252

5353
build:
5454
runs-on: ubuntu-latest
55-
container: ghcr.io/sagemath/sage/sage-${{ github.event.inputs.platform || 'ubuntu-focal-standard' }}-with-targets:${{ github.event.inputs.docker_tag || 'dev'}}
55+
container: ghcr.io/sagemath/sage/sage-${{ github.event.inputs.platform || 'ubuntu-jammy-standard' }}-with-targets:${{ github.event.inputs.docker_tag || 'dev'}}
5656
needs: [get_ci_fixes]
5757
steps:
5858
- name: Checkout
@@ -93,16 +93,16 @@ jobs:
9393
./bootstrap && make build
9494
working-directory: ./worktree-image
9595
env:
96-
MAKE: make -j2 --output-sync=recurse
97-
SAGE_NUM_THREADS: 2
96+
MAKE: make -j4 --output-sync=recurse
97+
SAGE_NUM_THREADS: 4
9898

9999
- name: Build modularized distributions
100100
if: (success() || failure()) && steps.worktree.outcome == 'success'
101101
run: make V=0 tox && make SAGE_CHECK=no pypi-wheels
102102
working-directory: ./worktree-image
103103
env:
104-
MAKE: make -j2 --output-sync=recurse
105-
SAGE_NUM_THREADS: 2
104+
MAKE: make -j4 --output-sync=recurse
105+
SAGE_NUM_THREADS: 4
106106

107107
- name: Static code check with pyright
108108
if: (success() || failure()) && steps.worktree.outcome == 'success'
@@ -137,8 +137,8 @@ jobs:
137137
./bootstrap && make doc-clean doc-uninstall sagelib-clean && git clean -fx src/sage && ./config.status
138138
working-directory: ./worktree-image
139139
env:
140-
MAKE: make -j2
141-
SAGE_NUM_THREADS: 2
140+
MAKE: make -j4
141+
SAGE_NUM_THREADS: 4
142142

143143
- name: Build
144144
# This step is needed because building the modularized distributions installs some optional packages,
@@ -149,8 +149,8 @@ jobs:
149149
make build
150150
working-directory: ./worktree-image
151151
env:
152-
MAKE: make -j2 --output-sync=recurse
153-
SAGE_NUM_THREADS: 2
152+
MAKE: make -j4 --output-sync=recurse
153+
SAGE_NUM_THREADS: 4
154154

155155
# Testing
156156

@@ -161,16 +161,16 @@ jobs:
161161
./sage -t --new -p2
162162
working-directory: ./worktree-image
163163
env:
164-
MAKE: make -j2 --output-sync=recurse
165-
SAGE_NUM_THREADS: 2
164+
MAKE: make -j4 --output-sync=recurse
165+
SAGE_NUM_THREADS: 4
166166

167167
- name: Test modularized distributions
168168
if: (success() || failure()) && steps.build.outcome == 'success'
169169
run: make V=0 tox && make pypi-wheels-check
170170
working-directory: ./worktree-image
171171
env:
172-
MAKE: make -j2 --output-sync=recurse
173-
SAGE_NUM_THREADS: 2
172+
MAKE: make -j4 --output-sync=recurse
173+
SAGE_NUM_THREADS: 4
174174

175175
- name: Check that all modules can be imported
176176
run: |

.github/workflows/ci-conda.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ jobs:
3535
# environment: [environment, environment-optional]
3636
conda-env: [environment]
3737
# On pull requests, only test two jobs:
38-
# Ubuntu with Python 3.9, macOS with Python 3.10.
39-
# Build & Test currently uses Python 3.11 (on ubuntu-focal).
38+
# Ubuntu with Python 3.9, macOS with Python 3.11.
39+
# Build & Test currently uses Python 3.10 (on ubuntu-jammy).
4040
# Together, they cover the supported minor Python versions.
4141
include: >-
4242
${{ github.event_name == 'pull_request'
43-
&& fromJson('[{"os": "macos", "python": "3.10", "conda-env": "environment"}]')
43+
&& fromJson('[{"os": "macos", "python": "3.11", "conda-env": "environment"}]')
4444
|| fromJson('[]') }}
4545
4646
steps:

.github/workflows/ci-linux.yml

+2-11
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
targets: build doc-html
4747
targets_optional: ptest
4848
tox_system_factors: >-
49-
["ubuntu-focal"]
49+
["ubuntu-jammy"]
5050
tox_packages_factors: >-
5151
["standard"]
5252
docker_push_repository: ghcr.io/${{ github.repository }}/
@@ -111,18 +111,11 @@ jobs:
111111
["ubuntu-jammy",
112112
"ubuntu-lunar",
113113
"ubuntu-mantic",
114-
"debian-bullseye",
115114
"debian-bookworm",
116115
"debian-trixie",
117116
"debian-sid",
118-
"linuxmint-21",
119117
"linuxmint-21.1",
120118
"linuxmint-21.2",
121-
"fedora-33",
122-
"fedora-34",
123-
"fedora-35",
124-
"fedora-36",
125-
"fedora-37",
126119
"fedora-38",
127120
"fedora-39",
128121
"centos-stream-8-python3.9",
@@ -131,11 +124,9 @@ jobs:
131124
"gentoo-python3.10",
132125
"gentoo-python3.11",
133126
"archlinux-latest",
134-
"opensuse-15.4-gcc_11-python3.10",
135127
"opensuse-15.5-gcc_11-python3.11",
136128
"opensuse-tumbleweed-python3.10",
137-
"opensuse-tumbleweed",
138-
"debian-bullseye-i386"]
129+
"opensuse-tumbleweed"]
139130
docker_push_repository: ghcr.io/${{ github.repository }}/
140131
max_parallel: 8
141132

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

+8-8
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
platform:
1010
description: 'Platform'
1111
required: true
12-
default: 'ubuntu-focal-standard'
12+
default: 'ubuntu-jammy-standard'
1313
docker_tag:
1414
description: 'Docker tag'
1515
required: true
@@ -46,7 +46,7 @@ jobs:
4646

4747
build-docs-pdf:
4848
runs-on: ubuntu-latest
49-
container: ghcr.io/sagemath/sage/sage-${{ github.event.inputs.platform || 'ubuntu-focal-standard' }}-with-targets:${{ github.event.inputs.docker_tag || 'dev'}}
49+
container: ghcr.io/sagemath/sage/sage-${{ github.event.inputs.platform || 'ubuntu-jammy-standard' }}-with-targets:${{ github.event.inputs.docker_tag || 'dev'}}
5050
needs: [get_ci_fixes]
5151
steps:
5252
- name: Checkout
@@ -87,8 +87,8 @@ jobs:
8787
./bootstrap && make build
8888
working-directory: ./worktree-image
8989
env:
90-
MAKE: make -j2 --output-sync=recurse
91-
SAGE_NUM_THREADS: 2
90+
MAKE: make -j4 --output-sync=recurse
91+
SAGE_NUM_THREADS: 4
9292

9393
- name: Build (fallback to non-incremental)
9494
id: build
@@ -98,8 +98,8 @@ jobs:
9898
make sagelib-clean && git clean -fx src/sage && ./config.status && make build
9999
working-directory: ./worktree-image
100100
env:
101-
MAKE: make -j2 --output-sync=recurse
102-
SAGE_NUM_THREADS: 2
101+
MAKE: make -j4 --output-sync=recurse
102+
SAGE_NUM_THREADS: 4
103103

104104
- name: Build docs (PDF)
105105
id: docbuild
@@ -108,8 +108,8 @@ jobs:
108108
make doc-clean doc-uninstall; make sagemath_doc_html-build-deps sagemath_doc_pdf-no-deps
109109
working-directory: ./worktree-image
110110
env:
111-
MAKE: make -j2 --output-sync=recurse
112-
SAGE_NUM_THREADS: 2
111+
MAKE: make -j4 --output-sync=recurse
112+
SAGE_NUM_THREADS: 4
113113

114114
- name: Copy docs
115115
id: copy

.github/workflows/doc-build.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141

4242
build-docs:
4343
runs-on: ubuntu-latest
44-
container: ghcr.io/sagemath/sage/sage-ubuntu-focal-standard-with-targets:dev
44+
container: ghcr.io/sagemath/sage/sage-ubuntu-jammy-standard-with-targets:dev
4545
needs: [get_ci_fixes]
4646
steps:
4747
- name: Checkout
@@ -95,8 +95,8 @@ jobs:
9595
./bootstrap && make sagemath_doc_html-build-deps
9696
working-directory: ./worktree-image
9797
env:
98-
MAKE: make -j2 --output-sync=recurse
99-
SAGE_NUM_THREADS: 2
98+
MAKE: make -j4 --output-sync=recurse
99+
SAGE_NUM_THREADS: 4
100100

101101
- name: Build (fallback to non-incremental)
102102
id: build
@@ -106,8 +106,8 @@ jobs:
106106
make sagelib-clean && git clean -fx src/sage && ./config.status && make sagemath_doc_html-build-deps
107107
working-directory: ./worktree-image
108108
env:
109-
MAKE: make -j2 --output-sync=recurse
110-
SAGE_NUM_THREADS: 2
109+
MAKE: make -j4 --output-sync=recurse
110+
SAGE_NUM_THREADS: 4
111111

112112
- name: Build docs
113113
id: docbuild
@@ -124,8 +124,8 @@ jobs:
124124
./config.status && make sagemath_doc_html-no-deps
125125
working-directory: ./worktree-image
126126
env:
127-
MAKE: make -j2 --output-sync=recurse
128-
SAGE_NUM_THREADS: 2
127+
MAKE: make -j4 --output-sync=recurse
128+
SAGE_NUM_THREADS: 4
129129

130130
- name: Copy docs
131131
id: copy
@@ -169,8 +169,8 @@ jobs:
169169
./config.status && make sagemath_doc_html-no-deps sagemath_doc_pdf-no-deps
170170
working-directory: ./worktree-image
171171
env:
172-
MAKE: make -j2 --output-sync=recurse
173-
SAGE_NUM_THREADS: 2
172+
MAKE: make -j4 --output-sync=recurse
173+
SAGE_NUM_THREADS: 4
174174

175175
- name: Copy live doc
176176
id: copylivedoc

0 commit comments

Comments
 (0)