Skip to content

Commit ea377d4

Browse files
tobiasdieztobiasdiez
authored
Merge branch 'develop' into meson-settings
2 parents d316add + c9dd1e8 commit ea377d4

File tree

885 files changed

+14920
-13853
lines changed

Some content is hidden

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

885 files changed

+14920
-13853
lines changed

‎.ci/write-dockerfile.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -275,11 +275,11 @@ cat <<EOF
275275
FROM with-system-packages AS bootstrapped
276276
#:bootstrapping:
277277
RUN rm -rf /new /sage/.git
278-
$ADD Makefile VERSION.txt COPYING.txt condarc.yml README.md bootstrap bootstrap-conda configure.ac sage .homebrew-build-env tox.ini Pipfile.m4 .gitignore /new/
278+
$ADD Makefile VERSION.txt COPYING.txt condarc.yml README.md bootstrap configure.ac sage .homebrew-build-env tox.ini .gitignore /new/
279279
$ADD config/config.rpath /new/config/config.rpath
280280
$ADD src/doc/bootstrap /new/src/doc/bootstrap
281281
$ADD src/bin /new/src/bin
282-
$ADD src/Pipfile.m4 src/pyproject.toml src/requirements.txt.m4 src/setup.cfg.m4 src/VERSION.txt /new/src/
282+
$ADD src/pyproject.toml src/requirements.txt.m4 src/setup.cfg.m4 src/VERSION.txt /new/src/
283283
$ADD m4 /new/m4
284284
$ADD pkgs /new/pkgs
285285
$ADD build /new/build

‎.devcontainer/onCreate-conda.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ conda config --env --add channels conda-forge
66
conda config --env --set channel_priority strict
77
conda update -y --all --override-channels -c conda-forge
88
conda install mamba=1 -n base -y
9-
mamba env create -y --file environment-dev-3.11-linux.yml || mamba env update -y --file environment-dev-3.11-linux.yml
9+
mamba env create -y --file environment-3.11-linux.yml || mamba env update -y --file environment-3.11-linux.yml
1010
conda init bash
1111

1212
# Build sage

‎.github/workflows/build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -589,6 +589,6 @@ jobs:
589589

590590
- name: Upload coverage to codecov
591591
if: (success() || failure()) && steps.container.outcome == 'success'
592-
uses: codecov/codecov-action@v4
592+
uses: codecov/codecov-action@v5
593593
with:
594594
directory: .coverage/coverage-report

‎.github/workflows/changelog_trigger.yml

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: Trigger Changelog Generation
2+
3+
on:
4+
release:
5+
types: [published]
6+
7+
jobs:
8+
trigger-website-repo-workflow:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: Trigger Generate Changelog Workflow in website repo
12+
if: "!github.event.release.prerelease"
13+
env:
14+
GITHUB_PAT: ${{ secrets.WEBSITE_ACCESS_TOKEN }}
15+
RELEASE_TAG: ${{ github.event.release.tag_name }}
16+
run: |
17+
curl -L \
18+
-X POST \
19+
-H "Accept: application/vnd.github+json" \
20+
-H "Authorization: Bearer $GITHUB_PAT" \
21+
-H "X-GitHub-Api-Version: 2022-11-28" \
22+
https://api.github.com/repos/sagemath/website/actions/workflows/generate_changelog.yml/dispatches \
23+
-d '{"ref":"master","inputs":{"release_tag":"'"$RELEASE_TAG"'"}}'

‎.github/workflows/ci-conda.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
use-mamba: true
7070
channels: conda-forge
7171
channel-priority: true
72-
activate-environment: sage
72+
activate-environment: sage-dev
7373
environment-file: ${{ matrix.conda-env }}-${{ matrix.python }}-${{ startsWith(matrix.os, 'macos') && (startsWith(runner.arch, 'ARM') && 'macos' || 'macos-x86_64') || 'linux' }}.yml
7474

7575
- name: Print Conda environment

‎.github/workflows/ci-linux.yml

+1
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ jobs:
5050
tox_packages_factors: >-
5151
["standard"]
5252
docker_push_repository: ghcr.io/${{ github.repository }}/
53+
logs_artifact: false
5354

5455
# All platforms. This duplicates the default platform, but why not,
5556
# it makes it more robust regarding random timeouts.

‎.github/workflows/ci-meson.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@ jobs:
4747
key: ${{ runner.os }}-meson-${{ matrix.python }}
4848

4949
- name: Setup Conda environment
50-
uses: conda-incubator/setup-miniconda@v2
50+
uses: conda-incubator/setup-miniconda@v3
5151
with:
5252
python-version: ${{ matrix.python }}
5353
miniforge-version: latest
5454
use-mamba: true
5555
channels: conda-forge
5656
channel-priority: true
57-
activate-environment: sage
57+
activate-environment: sage-dev
5858
environment-file: environment-${{ matrix.python }}-${{ startsWith(matrix.os, 'macos') && (startsWith(runner.arch, 'ARM') && 'macos' || 'macos-x86_64') || 'linux' }}.yml
5959

6060
- name: Print Conda environment

‎.github/workflows/conda-lock-update.py

-56
This file was deleted.

‎.github/workflows/doc-build.yml

+7-2
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ jobs:
154154
git config --global user.email "[email protected]"
155155
git config --global user.name "Build documentation workflow"
156156
unzip doc.zip
157+
rm doc.zip
157158
PR_NUMBER=""
158159
if [[ "$GITHUB_REF" =~ refs/pull/([0-9]+)/merge ]]; then
159160
PR_NUMBER="${BASH_REMATCH[1]}"
@@ -202,6 +203,10 @@ jobs:
202203
if: steps.docbuild.outcome == 'success'
203204
run: |
204205
set -ex
206+
# Remove any existing html directory before copying a new one
207+
if [ -d "doc/html" ]; then
208+
rm -rf doc/html
209+
fi
205210
# Simpler "docker cp --follow-link ... doc" does not work
206211
mkdir -p doc
207212
mkdir -p temp
@@ -217,7 +222,7 @@ jobs:
217222
fi
218223
# If so, then create CHANGES.html
219224
if [[ -n "$PR_NUMBER" ]]; then
220-
(cd doc && git commit -a -m 'new')
225+
(cd doc && git add -A && git commit --quiet -m 'new')
221226
# Wipe out chronic diffs of new doc against old doc before creating CHANGES.html
222227
(cd doc && \
223228
find . -name "*.html" | xargs sed -i -e '/This is documentation/ s/ built with GitHub PR .* for development/ for development/' \
@@ -229,7 +234,7 @@ jobs:
229234
# Since HEAD is at commit 'wipe-out', HEAD~1 is commit 'new' (new doc), HEAD~2 is commit 'old' (old doc)
230235
(cd doc && git diff $(git rev-parse HEAD~2) -- "*.html") > diff.txt
231236
# Restore the new doc dropping changes by "wipe out"
232-
(cd doc && git checkout -q -f HEAD~1)
237+
(cd doc && git checkout --quiet -f HEAD~1)
233238
.ci/create-changes-html.sh diff.txt doc
234239
# Sometimes rm -rf .git errors out because of some diehard hidden files
235240
# So we simply move it out of the doc directory

‎.github/workflows/docker.yml

+6-2
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,9 @@ on:
8585
description: 'Elapsed time (seconds) at which to kill the build'
8686
default: 20000
8787
type: number
88+
logs_artifact:
89+
default: true
90+
type: boolean
8891
#
8992
# Publishing to GitHub Packages
9093
#
@@ -260,11 +263,12 @@ jobs:
260263
cp -r .tox/$TOX_ENV/* "artifacts/$LOGS_ARTIFACT_NAME"
261264
rm -rf "artifacts/$LOGS_ARTIFACT_NAME"/{bin,lib,pyvenv.cfg}
262265
if: always()
263-
- uses: actions/upload-artifact@v4
266+
- name: Upload logs artifact
267+
uses: actions/upload-artifact@v4
264268
with:
265269
path: artifacts
266270
name: ${{ env.LOGS_ARTIFACT_NAME }}
267-
if: always()
271+
if: always() && inputs.logs_artifact
268272
- name: Print out logs for immediate inspection
269273
# and markup the output with GitHub Actions logging commands
270274
run: |

‎.gitignore

+2-6
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
# no longer generated, but may still be in user worktrees
2828
/src/lib/pkgconfig
2929

30-
# Environment files generated by bootstrap-conda.
31-
# The files without Python version and in src are no longer generated
30+
# Conda environment files
31+
# The files without Python version, with -dev or in src are no longer generated
3232
# but may still be in users' directories.
3333
/environment.yml
3434
/environment-3.9.yml
@@ -56,10 +56,6 @@
5656

5757
/src/setup.cfg
5858
/src/requirements.txt
59-
/src/Pipfile
60-
/src/Pipfile.lock
61-
/Pipfile
62-
/Pipfile.lock
6359

6460
# Various editors
6561
*~

‎.gitpod.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ tasks:
77
- name: Setup
88
# Create conda environment, then configure and build sage
99
init: >-
10-
&& mamba env create --file environment-dev-3.11-linux.yml --prefix venv
10+
&& mamba env create --file environment-3.11-linux.yml --prefix venv
1111
&& conda config --append envs_dirs $(pwd)
1212
&& conda activate $(pwd)/venv
1313
&& ./bootstrap

‎.upstream.d/20-github.com-sagemath-sage-releases

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Upstream packages as uploaded as GitHub release assets.
22
# This file is automatically updated by the sage-update-version script.
3+
https://github.com/sagemath/sage/releases/download/10.6/
34
https://github.com/sagemath/sage/releases/download/10.5/
45
https://github.com/sagemath/sage/releases/download/10.4/
5-
https://github.com/sagemath/sage/releases/download/10.3/

‎.vscode/settings.json

+82-2
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,90 @@
2424
],
2525
"python.testing.unittestEnabled": false,
2626
"cSpell.words": [
27-
"furo",
27+
"adic",
28+
"arccos",
29+
"arccosh",
30+
"arcsin",
31+
"arcsinh",
32+
"arctan",
33+
"arctanh",
34+
"Bejger",
35+
"bigcup",
36+
"cachefunc",
37+
"charpoly",
38+
"classmethod",
39+
"clopen",
40+
"codim",
41+
"codomain",
42+
"coframe",
43+
"coframes",
2844
"Conda",
45+
"cputime",
46+
"cysignals",
47+
"Cython",
48+
"d'Alembertian",
49+
"dalembertian",
50+
"disp",
51+
"doctest",
52+
"doctests",
53+
"emptyset",
54+
"figsize",
55+
"Florentin",
56+
"fontsize",
57+
"forall",
58+
"furo",
59+
"Gourgoulhon",
60+
"grayskull",
61+
"groebner",
62+
"homeomorphic",
63+
"homset",
64+
"homsets",
65+
"hypersurfaces",
66+
"infty",
67+
"Jaffredo",
68+
"Katsura",
69+
"Koeppe",
70+
"longmapsto",
71+
"longrightarrow",
72+
"mapsto",
73+
"mathbb",
74+
"mathrm",
75+
"Michal",
76+
"micjung",
77+
"Minkowski",
78+
"Möbius",
79+
"mpfr",
80+
"nabla",
81+
"Nullspace",
82+
"padics",
83+
"pari",
84+
"prandom",
85+
"Pynac",
86+
"rightarrow",
2987
"sagemath",
30-
"Cython"
88+
"scalarfield",
89+
"SEEALSO",
90+
"setminus",
91+
"smithform",
92+
"subchart",
93+
"subcharts",
94+
"subframe",
95+
"subframes",
96+
"subobjects",
97+
"subring",
98+
"superchart",
99+
"supercharts",
100+
"supersets",
101+
"sympy",
102+
"tensorfield",
103+
"trigsimp",
104+
"varphi",
105+
"vbundle",
106+
"vecmat",
107+
"vectorfield",
108+
"walltime",
109+
"zmax",
110+
"zmin"
31111
],
32112
"editor.formatOnType": true,
33113
"esbonio.sphinx.confDir": "",

‎CITATION.cff

+2-2
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.5.rc1
7+
version: 10.6.beta2
88
doi: 10.5281/zenodo.8042260
9-
date-released: 2024-11-23
9+
date-released: 2024-12-22
1010
repository-code: "https://github.com/sagemath/sage"
1111
url: "https://www.sagemath.org/"

‎Makefile

+1-2
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,7 @@ bootstrap-clean:
174174
rm -rf config/install-sh config/compile config/config.guess config/config.sub config/missing configure build/make/Makefile-auto.in
175175
rm -f src/doc/en/installation/*.txt
176176
find src/doc/en/reference/spkg -name index.rst -prune -o -maxdepth 1 -name "*.rst" -exec rm -f {} \+
177-
for a in environment environment-optional src/environment src/environment-dev src/environment-optional; do rm -f $$a.yml $$a-3.[89].yml $$a-3.1[0-9].yml; done
178-
rm -f src/Pipfile
177+
for a in environment environment-optional src/environment src/environment-optional; do rm -f $$a.yml $$a-3.[89].yml $$a-3.1[0-9].yml; done
179178
rm -f src/requirements.txt
180179
rm -f src/setup.cfg
181180
rm -f build/pkgs/cypari/version_requirements.txt

0 commit comments

Comments
 (0)