Skip to content

Commit 8ec0ad8

Browse files
authored
Merge branch 'develop' into feature/highs-backend
2 parents ff6ef88 + 5c8d9e9 commit 8ec0ad8

File tree

1,094 files changed

+7610
-7360
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,094 files changed

+7610
-7360
lines changed
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
// See https://aka.ms/devcontainer.json for format details.
2+
{
3+
"name": "debian-forky",
4+
"image": "debian:forky",
5+
"onCreateCommand": ".devcontainer/onCreate-meson.sh || true",
6+
"features": {
7+
"ghcr.io/devcontainers/features/git": {},
8+
"ghcr.io/devcontainers/features/python:1": {},
9+
"../uv": {
10+
"version": "latest"
11+
}
12+
},
13+
"containerEnv": {
14+
"devcontainerId": "${devcontainerId}",
15+
"UV_PROJECT_ENVIRONMENT": ".venv-${devcontainerId}"
16+
},
17+
"customizations": {
18+
"vscode": {
19+
"extensions": [
20+
"ms-python.python"
21+
]
22+
}
23+
}
24+
}

.github/workflows/changelog_trigger.yml renamed to .github/workflows/changelog-trigger.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Trigger Changelog Generation
1+
name: Trigger changelog generation
22

33
on:
44
release:
@@ -8,7 +8,7 @@ jobs:
88
trigger-website-repo-workflow:
99
runs-on: ubuntu-latest
1010
steps:
11-
- name: Trigger Generate Changelog Workflow in website repo
11+
- name: Trigger Generate Changelog workflow in website repo
1212
if: "!github.event.release.prerelease"
1313
env:
1414
GITHUB_PAT: ${{ secrets.WEBSITE_ACCESS_TOKEN }}

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ jobs:
2323
container:
2424
- fedora:41
2525
- fedora:42
26+
- debian:forky
2627
- ghcr.io/void-linux/void-glibc-full
2728
- archlinux
2829
#- ubuntu:22.04 - fails due to issue with cypari2

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
if: (success() || failure()) && steps.deps.outcome == 'success'
3636
run: |
3737
uv run --frozen --only-group lint -- ruff check --output-format github --ignore E402,E721,E731,E741,E742,E743,F401,F402,F403,F405,F821,F841,I001,PLC0206,PLC0208,PLC1802,PLC2401,PLC3002,PLC0415,PLE0302,PLR0124,PLR0402,PLR0911,PLR0912,PLR0913,PLR0915,PLR1704,PLR1711,PLR1714,PLR1716,PLR1733,PLR1736,PLR2004,PLR5501,PLW0120,PLW0211,PLW0602,PLW0603,PLW0642,PLW1508,PLW1510,PLW1641,PLW2901,PLW3301
38-
uv run --frozen --only-group lint -- ruff check --output-format github --preview --select E111,E115,E21,E221,E222,E225,E227,E228,E25,E271,E272,E275,E302,E303,E305,E306,E401,E502,E701,E702,E703,E71,W291,W293,W391,W605,TC src/sage/
38+
uv run --frozen --only-group lint -- ruff check --output-format github --preview --select E111,E115,E21,E221,E222,E225,E227,E228,E25,E271,E272,E275,E302,E303,E305,E306,E401,E502,E701,E702,E703,E71,W291,W293,W391,W605,TC,UP006 src/sage/
3939
4040
- name: Code style check with relint
4141
if: (success() || failure()) && steps.deps.outcome == 'success'

.github/workflows/dist.yml renamed to .github/workflows/release.yml

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Prepare source distributions and wheels
1+
name: Release distributions and wheels
22

33
on:
44
push:
@@ -185,7 +185,7 @@ jobs:
185185
# SPKGs to install as system packages
186186
SPKGS: _bootstrap _prereq
187187
# Non-Python packages to install as spkgs
188-
TARGETS_PRE: gmp mpfr mpc bliss coxeter3 mcqd meataxe sirocco boost_cropped tdlib
188+
TARGETS_PRE: gmp mpfr mpc bliss coxeter3 mcqd meataxe sirocco tdlib
189189
CIBW_BUILD: "*${{ matrix.build }}*"
190190
# Disable building PyPy wheels on all platforms
191191
CIBW_SKIP: "pp*"
@@ -247,25 +247,6 @@ jobs:
247247
(cd unpacked && tar xfz - ) < $sdist
248248
done
249249
250-
- name: sagemath-bliss
251-
run: |
252-
"${{ steps.python.outputs.python-path }}" -m cibuildwheel unpacked/sagemath*bliss*
253-
254-
- name: sagemath-coxeter3
255-
run: |
256-
"${{ steps.python.outputs.python-path }}" -m cibuildwheel unpacked/sagemath*coxeter3*
257-
258-
- name: sagemath-mcqd
259-
run: |
260-
"${{ steps.python.outputs.python-path }}" -m cibuildwheel unpacked/sagemath*mcqd*
261-
262-
- name: sagemath-tdlib
263-
run: |
264-
case "${{ matrix.arch }}" in
265-
i686) ;; # broken - boost-related
266-
*) "${{ steps.python.outputs.python-path }}" -m cibuildwheel unpacked/sagemath*tdlib*
267-
esac
268-
269250
- uses: actions/upload-artifact@v4
270251
with:
271252
name: ${{ matrix.os }}-${{ matrix.build }}-${{ matrix.arch }}-wheels

.gitignore

Lines changed: 6 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -25,34 +25,9 @@
2525
/m4/sage_spkg_configures.m4
2626
/m4/sage_spkg_versions*.m4
2727

28-
# no longer generated, but may still be in user worktrees
29-
/src/lib/pkgconfig
30-
3128
# Conda environment files (auto-generated)
3229
/environment-3.[0-9].yml
3330
/environment-3.[0-9][0-9].yml
34-
# The following files are no longer generated but may still be in users' directories
35-
/environment.yml
36-
/environment-dev-3.9.yml
37-
/environment-dev-3.10.yml
38-
/environment-dev-3.11.yml
39-
/environment-optional.yml
40-
/environment-optional-3.9.yml
41-
/environment-optional-3.10.yml
42-
/environment-optional-3.11.yml
43-
/src/environment.yml
44-
/src/environment-3.9.yml
45-
/src/environment-3.10.yml
46-
/src/environment-3.11.yml
47-
/src/environment-dev.yml
48-
/src/environment-dev-3.9.yml
49-
/src/environment-dev-3.10.yml
50-
/src/environment-dev-3.11.yml
51-
/src/environment-optional.yml
52-
/src/environment-optional-3.9.yml
53-
/src/environment-optional-3.10.yml
54-
/src/environment-optional-3.11.yml
55-
5631

5732
# Various editors
5833
*~
@@ -140,45 +115,6 @@ __pycache__/
140115
**/*.py[cod]
141116
*$py.class
142117

143-
# Generated by sage_setup.autogen
144-
/src/sage/ext/interpreters
145-
!/src/sage/ext/interpreters/meson.build
146-
!/src/sage/ext/interpreters/README
147-
148-
# Generated Cython files
149-
*.so
150-
**/*.so
151-
**/*.so.old
152-
/src/cython_debug
153-
# Most C and C++ files are generated by Cython and should not
154-
# be included in the sdist.
155-
/src/sage/**/*.c
156-
/src/sage/**/*.cpp
157-
# C header generated by Cython
158-
/src/sage/modular/arithgroup/farey_symbol.h
159-
# List of C and C++ files that are actual source files,
160-
# NOT generated by Cython. The same list appears in src/MANIFEST.in
161-
!/src/sage/graphs/base/boost_interface.cpp
162-
!/src/sage/graphs/cliquer/cl.c
163-
!/src/sage/graphs/graph_decompositions/sage_tdlib.cpp
164-
!/src/sage/libs/eclib/wrap.cpp
165-
!/src/sage/libs/linkages/padics/relaxed/flint_helper.c
166-
!/src/sage/misc/inherit_comparison_impl.c
167-
!/src/sage/modular/arithgroup/farey.cpp
168-
!/src/sage/modular/arithgroup/sl2z.cpp
169-
!/src/sage/rings/bernmm/bern_modp.cpp
170-
!/src/sage/rings/bernmm/bern_modp_util.cpp
171-
!/src/sage/rings/bernmm/bern_rat.cpp
172-
!/src/sage/rings/bernmm/bernmm-test.cpp
173-
!/src/sage/rings/padics/transcendantal.c
174-
!/src/sage/rings/polynomial/weil/power_sums.c
175-
!/src/sage/schemes/hyperelliptic_curves/hypellfrob/hypellfrob.cpp
176-
!/src/sage/schemes/hyperelliptic_curves/hypellfrob/recurrences_ntl.cpp
177-
!/src/sage/stats/distributions/dgs_bern.c
178-
!/src/sage/stats/distributions/dgs_gauss_dp.c
179-
!/src/sage/stats/distributions/dgs_gauss_mp.c
180-
!/src/sage/symbolic/ginac/*.cpp
181-
182118
# Temporary build files
183119
build/temp.*/
184120
build/bin/sage-build-env-config
@@ -206,32 +142,14 @@ build/pkgs/wheel/version_requirements.txt
206142
/pkgs/*/.venv*
207143

208144
/pkgs/sagemath-objects/setup.cfg
209-
/pkgs/sagemath-bliss/setup.cfg
210-
/pkgs/sagemath-coxeter3/setup.cfg
211-
/pkgs/sagemath-mcqd/setup.cfg
212-
/pkgs/sagemath-meataxe/setup.cfg
213-
/pkgs/sagemath-sirocco/setup.cfg
214-
/pkgs/sagemath-tdlib/setup.cfg
215145
/pkgs/sagemath-categories/setup.cfg
216146
/pkgs/sagemath-environment/setup.cfg
217147
/pkgs/sagemath-repl/setup.cfg
218148
/pkgs/sagemath-objects/pyproject.toml
219-
/pkgs/sagemath-bliss/pyproject.toml
220-
/pkgs/sagemath-coxeter3/pyproject.toml
221-
/pkgs/sagemath-mcqd/pyproject.toml
222-
/pkgs/sagemath-meataxe/pyproject.toml
223-
/pkgs/sagemath-sirocco/pyproject.toml
224-
/pkgs/sagemath-tdlib/pyproject.toml
225149
/pkgs/sagemath-categories/pyproject.toml
226150
/pkgs/sagemath-environment/pyproject.toml
227151
/pkgs/sagemath-repl/pyproject.toml
228152
/pkgs/sagemath-objects/requirements*.txt
229-
/pkgs/sagemath-bliss/requirements*.txt
230-
/pkgs/sagemath-coxeter3/requirements*.txt
231-
/pkgs/sagemath-mcqd/requirements*.txt
232-
/pkgs/sagemath-meataxe/requirements*.txt
233-
/pkgs/sagemath-sirocco/requirements*.txt
234-
/pkgs/sagemath-tdlib/requirements*.txt
235153
/pkgs/sagemath-categories/requirements*.txt
236154
/pkgs/sagemath-environment/requirements*.txt
237155
/pkgs/sagemath-repl/requirements*.txt
@@ -244,16 +162,6 @@ build/pkgs/wheel/version_requirements.txt
244162
/build/pkgs/*/src/*.egg-info
245163
/build/pkgs/*/src/.tox
246164

247-
# Generated by docbuild
248-
/src/doc/en/reference/*/sage
249-
/src/doc/en/reference/*/sage_docbuild
250-
/src/doc/en/reference/sage
251-
/src/doc/en/reference/spkg/*.rst
252-
!/src/doc/en/reference/spkg/index.rst
253-
/src/doc/output
254-
/src/doc/en/installation/*.txt
255-
/src/doc/en/reference/repl/*.txt
256-
257165
# Distribution / packaging
258166
src/*.egg-info/
259167
/src/.cython_version
@@ -288,12 +196,6 @@ src/.coverage/
288196
worktree*
289197
**/worktree*
290198

291-
# Meson build directory
292-
builddir
293-
builddir-*
294-
build-install
295-
build/cp*
296-
297199
# Meson subprojects
298200
/subprojects/*
299201
!/subprojects/*.wrap
@@ -313,6 +215,7 @@ src/sage/dynamics/cellular_automata/__init__.py
313215
src/sage/dynamics/arithmetic_dynamics/__init__.py
314216
src/sage/dynamics/__init__.py
315217
src/sage/dynamics/complex_dynamics/__init__.py
218+
src/sage/ext/interpreters/__init__.py
316219
src/sage/knots/__init__.py
317220
src/sage/topology/__init__.py
318221
src/sage/functions/__init__.py
@@ -470,3 +373,8 @@ src/sage/calculus/__init__.py
470373
# ci-meson.yml runs a `./tools/test-git-no-uncommitted-changes` step)
471374
/.ccache
472375
/setup-miniconda-patched-environment-*.yml
376+
377+
# bootstrap-time generated docs
378+
/src/doc/en/installation/*.txt
379+
/src/doc/en/reference/spkg/*.rst
380+
!/src/doc/en/reference/spkg/index.rst

.homebrew-build-env

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@ for l in bzip2 texinfo polymake; do
88
fi
99
done
1010
export PATH
11-
PKG_CONFIG_PATH="$HOMEBREW/lib/pkgconfig:$PKG_CONFIG_PATH"
11+
if [ -z "$PKG_CONFIG_PATH" ]; then
12+
PKG_CONFIG_PATH="$HOMEBREW/lib/pkgconfig"
13+
else
14+
PKG_CONFIG_PATH="$HOMEBREW/lib/pkgconfig:$PKG_CONFIG_PATH"
15+
fi
1216
# libpng.pc depends on zlib.pc
1317
for l in openblas openssl readline sqlite zlib; do
1418
if [ -d "$HOMEBREW/opt/$l/lib/pkgconfig" ]; then

.vscode/settings.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
"Cython",
4343
"d'Alembertian",
4444
"dalembertian",
45+
"devcontainers",
4546
"disp",
4647
"doctest",
4748
"doctests",

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.8.beta7
7+
version: 10.8.beta9
88
doi: 10.5281/zenodo.8042260
9-
date-released: 2025-10-16
9+
date-released: 2025-11-11
1010
repository-code: "https://github.com/sagemath/sage"
1111
url: "https://www.sagemath.org/"

COPYING.txt

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ SOFTWARE LICENSE
3333
-----------------------------------------------------------------------
3434
boehm_gc MIT-like license (see below)
3535
backports_ssl_match_hostname Python License
36-
boost_cropped Boost Software License (see below)
3736
cddlib GPLv2+
3837
certifi ISC
3938
cliquer GPLv2+
@@ -795,35 +794,6 @@ simplicity, included in its entirety.
795794

796795
================================================================================
797796

798-
boost_cropped:
799-
(http://www.boost.org/LICENSE_1_0.txt)
800-
801-
Boost Software License - Version 1.0 - August 17th, 2003
802-
803-
Permission is hereby granted, free of charge, to any person or organization
804-
obtaining a copy of the software and accompanying documentation covered by
805-
this license (the "Software") to use, reproduce, display, distribute,
806-
execute, and transmit the Software, and to prepare derivative works of the
807-
Software, and to permit third-parties to whom the Software is furnished to
808-
do so, all subject to the following:
809-
810-
The copyright notices in the Software and this entire statement, including
811-
the above license grant, this restriction and the following disclaimer,
812-
must be included in all copies of the Software, in whole or in part, and
813-
all derivative works of the Software, unless such copies or derivative
814-
works are solely in the form of machine-executable object code generated by
815-
a source language processor.
816-
817-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
818-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
819-
FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
820-
SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
821-
FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
822-
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
823-
DEALINGS IN THE SOFTWARE.
824-
825-
================================================================================
826-
827797
bzip2:
828798
(http://www.bzip.org/)
829799
This program, "bzip2", the associated library "libbzip2", and all

0 commit comments

Comments
 (0)