Skip to content

Commit a2cc52f

Browse files
tobiasdieztobiasdiez
authored
Merge branch 'develop' into ci-conda-pyright
2 parents 4f233cc + 9cd86e9 commit a2cc52f

File tree

234 files changed

+5660
-1884
lines changed

Some content is hidden

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

234 files changed

+5660
-1884
lines changed

‎.github/workflows/build.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ on:
1515
platform:
1616
description: 'Platform'
1717
required: true
18-
default: 'ubuntu-jammy-standard'
18+
default: 'ubuntu-noble-standard'
1919
docker_tag:
2020
description: 'Docker tag'
2121
required: true
@@ -68,8 +68,8 @@ concurrency:
6868

6969
env:
7070
# Adapted from docker.yml
71-
TOX_ENV: "docker-${{ github.event.inputs.platform || 'ubuntu-jammy-standard' }}-incremental"
72-
BUILD_IMAGE: "localhost:5000/${{ github.repository }}/sage-${{ github.event.inputs.platform || 'ubuntu-jammy-standard' }}-with-targets:ci"
71+
TOX_ENV: "docker-${{ github.event.inputs.platform || 'ubuntu-noble-standard' }}-incremental"
72+
BUILD_IMAGE: "localhost:5000/${{ github.repository }}/sage-${{ github.event.inputs.platform || 'ubuntu-noble-standard' }}-with-targets:ci"
7373
FROM_DOCKER_REPOSITORY: "ghcr.io/sagemath/sage/"
7474
FROM_DOCKER_TARGET: "with-targets"
7575
FROM_DOCKER_TAG: ${{ github.event.inputs.docker_tag || 'dev'}}

‎.github/workflows/ci-meson.yml‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,19 @@ jobs:
7272
# Use --no-deps and pip check below to verify that all necessary dependencies are installed via conda
7373
pip install --no-build-isolation --no-deps --config-settings=builddir=builddir . -v
7474
75+
- name: Check update-meson
76+
# this step must be after build, because meson.build creates a number of __init__.py files
77+
# that is needed to make tools/update-meson.py run correctly
78+
shell: bash -l {0}
79+
run: |
80+
python3 tools/update-meson.py
81+
if ! ./tools/test-git-no-uncommitted-changes; then
82+
git add --intent-to-add . # also show newly created files in git diff
83+
git status
84+
git diff
85+
false
86+
fi
87+
7588
- name: Verify dependencies
7689
shell: bash -l {0}
7790
run: pip check
@@ -81,7 +94,7 @@ jobs:
8194
run: |
8295
# We don't install sage_setup, so don't try to test it
8396
rm -R ./src/sage_setup/
84-
./sage -t --all -p4
97+
./sage -t --all -p4 --format github
8598
8699
- name: Upload log
87100
uses: actions/[email protected]

‎.github/workflows/dist.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ jobs:
216216
#
217217
CIBW_ARCHS: ${{ matrix.arch }}
218218
# https://cibuildwheel.readthedocs.io/en/stable/options/#requires-python
219-
CIBW_PROJECT_REQUIRES_PYTHON: ">=3.9, <3.13"
219+
CIBW_PROJECT_REQUIRES_PYTHON: ">=3.11, <3.13"
220220
# Environment during wheel build
221221
CIBW_ENVIRONMENT: "PATH=$(pwd)/prefix/bin:$PATH CPATH=$(pwd)/prefix/include:$CPATH LIBRARY_PATH=$(pwd)/prefix/lib:$LIBRARY_PATH LD_LIBRARY_PATH=$(pwd)/prefix/lib:$LD_LIBRARY_PATH PKG_CONFIG_PATH=$(pwd)/prefix/share/pkgconfig:$PKG_CONFIG_PATH ACLOCAL_PATH=/usr/share/aclocal PIP_CONSTRAINT=$(pwd)/constraints.txt PIP_FIND_LINKS=file://$(pwd)/wheelhouse SAGE_NUM_THREADS=6"
222222
# Use 'build', not 'pip wheel'

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
platform:
1010
description: 'Platform'
1111
required: true
12-
default: 'ubuntu-jammy-standard'
12+
default: 'ubuntu-noble-standard'
1313
docker_tag:
1414
description: 'Docker tag'
1515
required: true
@@ -22,8 +22,8 @@ concurrency:
2222

2323
env:
2424
# Same as in build.yml
25-
TOX_ENV: "docker-${{ github.event.inputs.platform || 'ubuntu-jammy-standard' }}-incremental"
26-
BUILD_IMAGE: "localhost:5000/${{ github.repository }}/sage-${{ github.event.inputs.platform || 'ubuntu-jammy-standard' }}-with-targets:ci"
25+
TOX_ENV: "docker-${{ github.event.inputs.platform || 'ubuntu-noble-standard' }}-incremental"
26+
BUILD_IMAGE: "localhost:5000/${{ github.repository }}/sage-${{ github.event.inputs.platform || 'ubuntu-noble-standard' }}-with-targets:ci"
2727
FROM_DOCKER_REPOSITORY: "ghcr.io/sagemath/sage/"
2828
FROM_DOCKER_TARGET: "with-targets"
2929
FROM_DOCKER_TAG: ${{ github.event.inputs.docker_tag || 'dev'}}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ on:
2020
platform:
2121
description: 'Platform'
2222
required: true
23-
default: 'ubuntu-jammy-standard'
23+
default: 'ubuntu-noble-standard'
2424
docker_tag:
2525
description: 'Docker tag'
2626
required: true
@@ -33,8 +33,8 @@ concurrency:
3333

3434
env:
3535
# Same as in build.yml
36-
TOX_ENV: "docker-${{ github.event.inputs.platform || 'ubuntu-jammy-standard' }}-incremental"
37-
BUILD_IMAGE: "localhost:5000/${{ github.repository }}/sage-${{ github.event.inputs.platform || 'ubuntu-jammy-standard' }}-with-targets:ci"
36+
TOX_ENV: "docker-${{ github.event.inputs.platform || 'ubuntu-noble-standard' }}-incremental"
37+
BUILD_IMAGE: "localhost:5000/${{ github.repository }}/sage-${{ github.event.inputs.platform || 'ubuntu-noble-standard' }}-with-targets:ci"
3838
FROM_DOCKER_REPOSITORY: "ghcr.io/sagemath/sage/"
3939
FROM_DOCKER_TARGET: "with-targets"
4040
FROM_DOCKER_TAG: ${{ github.event.inputs.docker_tag || 'dev'}}

‎.gitignore‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,6 @@ __pycache__/
158158
/src/sage/modular/arithgroup/farey_symbol.h
159159
# List of C and C++ files that are actual source files,
160160
# NOT generated by Cython. The same list appears in src/MANIFEST.in
161-
!/src/sage/cpython/debugimpl.c
162161
!/src/sage/graphs/base/boost_interface.cpp
163162
!/src/sage/graphs/cliquer/cl.c
164163
!/src/sage/graphs/graph_decompositions/sage_tdlib.cpp
@@ -467,3 +466,8 @@ src/sage/libs/mpfr/__init__.py
467466
src/sage/libs/mpc/__init__.py
468467
src/sage/calculus/transforms/__init__.py
469468
src/sage/calculus/__init__.py
469+
470+
# Temporary files generated by Meson CI (needed to make test pass because
471+
# ci-meson.yml runs a `./tools/test-git-no-uncommitted-changes` step)
472+
/.ccache
473+
/setup-miniconda-patched-environment-*.yml

‎CITATION.cff‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ title: SageMath
44
abstract: SageMath is a free open-source mathematics software system.
55
authors:
66
- name: "The SageMath Developers"
7-
version: 10.6.beta6
7+
version: 10.6.beta7
88
doi: 10.5281/zenodo.8042260
9-
date-released: 2025-02-10
9+
date-released: 2025-02-21
1010
repository-code: "https://github.com/sagemath/sage"
1111
url: "https://www.sagemath.org/"

‎Makefile‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -254,13 +254,7 @@ TEST_TARGET = $@
254254
TEST = ./sage -t --logfile=$(TEST_LOG) $(TEST_FLAGS) --optional=$(TEST_OPTIONAL) $(TEST_FILES)
255255

256256
test-git-no-uncommitted-changes:
257-
@UNCOMMITTED=$$(git status --porcelain); \
258-
if [ -n "$$UNCOMMITTED" ]; then \
259-
echo "Error: the git repo has uncommitted changes:"; \
260-
echo "$$UNCOMMITTED"; \
261-
echo; \
262-
exit 1; \
263-
fi
257+
./tools/test-git-no-uncommitted-changes
264258

265259
test: all
266260
@echo '### make $(TEST_TARGET): Running $(TEST)' >> $(TEST_LOG)

‎README.md‎

Lines changed: 15 additions & 9 deletions

‎VERSION.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SageMath version 10.6.beta6, Release Date: 2025-02-10
1+
SageMath version 10.6.beta7, Release Date: 2025-02-21

0 commit comments

Comments
 (0)