Skip to content

Commit c960011

Browse files
Noel-RoemmeleNoel-Roemmele
authored
Merge branch 'sagemath:develop' into 39158NonCoprimeCRTVector
2 parents 33ea807 + 7888c42 commit c960011

File tree

251 files changed

+8038
-1304
lines changed

Some content is hidden

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

251 files changed

+8038
-1304
lines changed

‎.ci/write-dockerfile.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,7 @@ $ADD m4 /new/m4
284284
$ADD pkgs /new/pkgs
285285
$ADD build /new/build
286286
$ADD .upstream.d /new/.upstream.d
287+
$ADD tools /new/tools
287288
ADD .ci /.ci
288289
RUN if [ -d /sage ]; then \\
289290
echo "### Incremental build from \$(cat /sage/VERSION.txt)" && \\

‎.github/workflows/ci-linux-incremental.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ name: CI Linux incremental
1818
on:
1919
pull_request:
2020
paths:
21+
- '.github/workflows/ci-linux-incremental.yml'
2122
- 'build/pkgs/**'
2223
- '!build/pkgs/sage_conf/**'
2324
- '!build/pkgs/sage_docbuild/**'
@@ -95,13 +96,11 @@ jobs:
9596
targets: "${{needs.changed_files.outputs.build_targets}} ci-build-with-fallback doc-html ptest-nodoc"
9697
tox_system_factors: >-
9798
["ubuntu-focal",
98-
"ubuntu-noble",
99+
"ubuntu-jammy",
99100
"debian-bullseye",
100101
"debian-bookworm",
101-
"fedora-30",
102-
"fedora-40",]
102+
"fedora-41",]
103103
tox_packages_factors: >-
104-
["standard",
105-
"minimal"]
104+
["standard"]
106105
docker_push_repository: ghcr.io/${{ github.repository }}/
107106
max_parallel: 8

‎.github/workflows/ci-macos.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ name: CI macOS
1818
#on: [push, pull_request]
1919

2020
on:
21+
pull_request:
22+
paths:
23+
- '.github/workflows/ci-macos.yml'
24+
- '.github/workflows/macos.yml'
2125
push:
2226
tags:
2327
- '*'
@@ -60,7 +64,7 @@ jobs:
6064
stage-2-experimental-0-o:
6165
uses: ./.github/workflows/macos.yml
6266
with:
63-
stage: "2-optional-0-o"
67+
stage: "2-experimental-0-o"
6468
needs: [stage-2-optional-p-z]
6569
if: ${{ success() || failure() }}
6670

‎.github/workflows/docker.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ on:
1818
# 'tox -e update_docker_platforms' updates below
1919
default: >-
2020
[
21-
"ubuntu-xenial-toolchain-gcc_9",
2221
"ubuntu-focal",
2322
"ubuntu-jammy",
2423
"debian-bullseye",

‎.github/workflows/macos.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
env:
6767
TOX_ENV: local-${{ matrix.osversion_xcodeversion_toxenv[2] }}${{ matrix.osversion_xcodeversion_toxenv[1] && format('-{0}', matrix.osversion_xcodeversion_toxenv[1]) }}
6868
LOCAL_ARTIFACT_NAME: sage-local-commit-${{ github.sha }}-tox-local-${{ matrix.osversion_xcodeversion_toxenv[2] }}-macos-${{ matrix.osversion_xcodeversion_toxenv[0] }}${{ matrix.osversion_xcodeversion_toxenv[1] && format('-{0}', matrix.osversion_xcodeversion_toxenv[1]) }}
69-
LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-local-${{ matrix.osversion_xcodeversion_toxenv[2] }}-macos-${{ matrix.osversion_xcodeversion_toxenv[0] }}${{ matrix.osversion_xcodeversion_toxenv[1] && format('-{0}', matrix.osversion_xcodeversion_toxenv[1]) }}
69+
LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-local-${{ matrix.osversion_xcodeversion_toxenv[2] }}-macos-${{ matrix.osversion_xcodeversion_toxenv[0] }}${{ matrix.osversion_xcodeversion_toxenv[1] && format('-{0}', matrix.osversion_xcodeversion_toxenv[1]) }}-stage${{ inputs.stage }}
7070
steps:
7171
- name: Check out SageMath
7272
uses: actions/checkout@v4
@@ -163,4 +163,4 @@ jobs:
163163
with:
164164
path: sage-local-artifact/sage-${{ env.TOX_ENV }}-${{ inputs.stage }}.tar
165165
name: ${{ env.LOCAL_ARTIFACT_NAME }}
166-
if: always()
166+
if: contains(inputs.stage, '1')

‎.upstream.d/20-gb.xjqchip.workers.dev-sagemath-sage-releases

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Upstream packages as uploaded as GitHub release assets.
2-
# This file is automatically updated by the sage-update-version script.
2+
# This file is automatically updated by the update-version script.
33
https://github.com/sagemath/sage/releases/download/10.7/
44
https://github.com/sagemath/sage/releases/download/10.6/

‎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.7.beta1
7+
version: 10.7.beta2
88
doi: 10.5281/zenodo.8042260
9-
date-released: 2025-04-18
9+
date-released: 2025-04-29
1010
repository-code: "https://github.com/sagemath/sage"
1111
url: "https://www.sagemath.org/"

‎Pipfile

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
## Pipfile with all packages in the Sage distribution and version information locked
2+
## FIXME: Many packages still missing.
3+
[[source]]
4+
name = "pypi"
5+
url = "https://pypi.org/simple"
6+
verify_ssl = true
7+
8+
[dev-packages]
9+
pkgconfig = "==1.5.5"
10+
cython = "==3.0.11"
11+
pycodestyle = "*"
12+
ipykernel = "==6.27.1"
13+
tox = "*"
14+
jinja2 = "==3.1.4"
15+
pytest = "*"
16+
ipywidgets = "==8.1.1"
17+
sphinx = "==7.4.7"
18+
rope = "*"
19+
six = "*"
20+
jupyter-core = "==5.3.2"
21+
22+
[packages]
23+
numpy = "==1.26.3"
24+
cysignals = "==1.11.4"
25+
cypari2 = "==2.2.0"
26+
gmpy2 = "==2.2.0a1"
27+
pexpect = "==4.9.0"
28+
ipython = "==8.18.1"
29+
sympy = "==1.13.2"
30+
scipy = "==1.12.0"
31+
pplpy = "==0.8.9"
32+
matplotlib = "==3.8.0"
33+
cvxopt = "==1.3.2"
34+
rpy2 = "==3.4.5"
35+
networkx = "==3.2.1"
36+
37+
sagemath-standard = { path = "src" }
38+
39+
[requires]
40+
python_version = "3.9"

‎VERSION.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SageMath version 10.7.beta1, Release Date: 2025-04-18
1+
SageMath version 10.7.beta2, Release Date: 2025-04-29

‎build/pkgs/configure/checksums.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
tarball=configure-VERSION.tar.gz
2-
sha1=db1650ff7b9bb3d07adbf2c6c1d4be2e39c22920
3-
sha256=7998f8b4ce7b527248461f87b305752f18d07460792d157447bd31b45b0dbc3d
2+
sha1=ccd2ea260f6193ef117e33345b48cb5ba773144a
3+
sha256=d40b2445b4973363e7f614a279fbdadeb7c977900091d2b6b619238c5073cdcf

‎build/pkgs/configure/package-version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
f5f628fca5c3bb985701204784f089d176a7caa6
1+
14e996467f713ae5f7f77357bcbb7753443010b4

‎build/pkgs/e_antic/patches/gmp-header.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
--- libeantic/srcxx/renf_elem_class.cpp 2025-03-27 16:35:20.026216756 -0500
2-
+++ libeantic/srcxx/renf_elem_class.cpp 2025-03-27 16:35:07.743757663 -0500
1+
--- a/libeantic/srcxx/renf_elem_class.cpp 2025-03-27 16:35:20.026216756 -0500
2+
+++ b/libeantic/srcxx/renf_elem_class.cpp 2025-03-27 16:35:07.743757663 -0500
33
@@ -12,6 +12,7 @@
44

55
#include <iostream>

‎build/pkgs/gap_packages/SPKG.rst

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,23 @@ Graaf)
5656
crime - package to compute the cohomology ring of finite p-groups,
5757
induced maps, and Massey products. (Author: Marcus Bishop)
5858

59+
crypting - The crypting package provides some cryptographic primitives so that the JupyterKernel package works.
60+
(Authors: Markus Pfeiffer and The GAP Team)
61+
5962
cryst - Computing with crystallographic groups (Authors: Bettina Eick,
6063
Franz Gähler, Werner Nickel)
6164

6265
CTblLib - The GAP Character Table Library (Author: Thomas Breuer)
6366

67+
datastructures - The datastructures package provides some standard data structures.
68+
(Authors: Markus Pfeiffer, Max Horn, Christopher Jefferson and Steve Linton)
69+
6470
DESIGN is a package for classifying, partitioning and studying block
6571
designs. (Author: Leonard H. Soicher)
6672

73+
Digraphs - GAP package containing methods for graphs, digraphs, and multidigraphs.
74+
(Authors: Jan De Beule, Julius Jonusas, James Mitchell, Wilf A. Wilson, Michael Young, Marina Anagnostopoulou-Merkouri, Finn Buck, Stuart Burrell, Graham Campbell, Raiyan Chowdhury, Reinis Cirpons, Ashley Clayton, Tom Conti-Leslie, Joseph Edwards, Luna Elliott, Isuru Fernando, Ewan Gilligan, Sebastian Gutsche, Samantha Harper, Max Horn, Christopher Jefferson, Olexandr Konovalov, Hyeokjun Kwon, Andrea Lee, Saffron McIver, Michael Orlitzky, Matthew Pancer, Markus Pfeiffer, Daniel Pointon, Lea Racine, Christopher Russell, Artur Schaefer, Isabella Scott, Kamran Sharma, Finn Smith, Ben Spiers, Maria Tsalakou, Meike Weiss, Murray Whyte and Fabian Zickgraf)
75+
6776
FactInt is a package providing routines for factoring integers, in
6877
particular:
6978

@@ -106,6 +115,10 @@ hecke - Provides functions for calculating decomposition matrices of
106115
Hecke algebras of the symmetric groups and q-Schur algebras. Hecke is a
107116
port of the GAP 3 package Specht 2.4 to GAP 4. (Author: Dmitriy Traytel)
108117

118+
IO - as its name suggests, provides bindings for GAP to the lower levels
119+
of Input/Output functionality in the C library.
120+
(Authors: Max Neunhöffer and Max Horn)
121+
109122
LAGUNA - this package provides functionality for calculation of the
110123
normalized unit group of the modular group algebra of the finite p-group
111124
and for investigation of Lie algebra associated with group algebras and
@@ -122,6 +135,10 @@ LieRing - contains functionality for working with finitely presented Lie
122135
rings and the Lazard correspondence. (Author: Serena Cicalo', Willem
123136
Adriaan de Graaf)
124137

138+
LINS - provides an algorithm for computing the normal subgroups of a
139+
finitely presented group up to some given index bound. (Author:
140+
Friedrich Rober)
141+
125142
loops - Provides researchers in nonassociative algebra with a
126143
computational tool that integrates standard notions of loop theory with
127144
libraries of loops and group-theoretical algorithms of GAP. The package
@@ -132,6 +149,13 @@ mapclass - The package calculates the mapping class group orbits for a
132149
given finite group. (Authors: Adam James, Kay Magaard, Sergey
133150
Shpectorov, Helmut Volklein)
134151

152+
nq - This package provides access to the ANU nilpotent quotient program
153+
for computing nilpotent factor groups of finitely presented groups.
154+
(Authors: Max Horn and Werner Nickel)
155+
156+
orb - This package is about enumerating orbits in various ways.
157+
(Authors: Juergen Mueller, Max Neunhöffer, Felix Noeske and Max Horn)
158+
135159
polymake - an interface with the (standalone) polymake program used by
136160
HAPcryst. (Author: Marc Roeder)
137161

@@ -149,6 +173,34 @@ Adriaan de Graaf)
149173
repsn - The package provides GAP functions for computing characteristic
150174
zero matrix representations of finite groups. (Author: Vahid Dabbaghian)
151175

176+
Semigroups - This is a GAP package for semigroups, and monoids. There are
177+
particularly efficient methods for finitely presented semigroups and monoids,
178+
and for semigroups and monoids consisting of transformations, partial
179+
permutations, bipartitions, partitioned binary relations, subsemigroups of
180+
regular Rees 0-matrix semigroups, and matrices of various semirings including
181+
boolean matrices, matrices over finite fields, and certain tropical matrices.
182+
Semigroups contains efficient methods for creating semigroups, monoids, and
183+
inverse semigroups and monoids, calculating their Green's structure, ideals,
184+
size, elements, group of units, small generating sets, testing membership,
185+
finding the inverses of a regular element, factorizing elements over the
186+
generators, and so on. It is possible to test if a semigroup satisfies a
187+
particular property, such as if it is regular, simple, inverse, completely
188+
regular, and a large number of further properties. There are methods for
189+
finding presentations for a semigroup, the congruences of a semigroup, the
190+
maximal subsemigroups of a finite semigroup, smaller degree partial
191+
permutation representations, and the character tables of inverse semigroups.
192+
There are functions for producing pictures of the Green's structure of a
193+
semigroup, and for drawing graphical representations of certain types of
194+
elements. (Authors: James Mitchell, Marina Anagnostopoulou-Merkouri,
195+
Thomas Breuer, Stuart Burrell, Reinis Cirpons, Tom Conti-Leslie,
196+
Joseph Edwards, Attila Egri-Nagy, Luke Elliott, Fernando Flores Brito,
197+
Tillman Froehlich, Nick Ham, Robert Hancock, Max Horn, Christopher Jefferson,
198+
Julius Jonusas, Chinmaya Nagpal, Olexandr Konovalov, Artemis Konstantinidi,
199+
Hyeokjun Kwon, Dima V. Pasechnik, Markus Pfeiffer, Christopher Russell,
200+
Jack Schmidt, Sergio Siccha, Finn Smith, Ben Spiers, Nicolas Thiéry,
201+
Maria Tsalakou, Chris Wensley, Murray Whyte, Wilf A. Wilson, Tianrun Yang,
202+
Michael Young and Fabian Zickgraf)
203+
152204
sla - a package for doing computations with simple Lie algebras (Author:
153205
Willem Adriaan de Graaf)
154206

‎build/pkgs/gap_packages/spkg-install.in

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ sdh_install \
5656
liealgdb \
5757
liepring \
5858
liering \
59+
lins \
5960
loops \
6061
mapclass \
6162
polymaking \
@@ -98,7 +99,7 @@ do
9899
export CFLAGS
99100
cd "$PKG_SRC_DIR/$pkg"
100101
./configure "$GAP_ROOT"
101-
sdh_make -j1
102+
sdh_make
102103
install_compiled_pkg "$pkg"
103104
cd "$PKG_SRC_DIR"
104105
done
@@ -109,7 +110,7 @@ done
109110
#############################################################################
110111
########## add extra parameters for packages' configures here ###############
111112
#
112-
# ng : none
113+
# nq : none
113114
# io : none
114115
# semigroups needs to use external libsemigroups
115116
# digraphs needs to use external planarity
@@ -123,7 +124,7 @@ do
123124
cd "$PKG_SRC_DIR/$pkg"
124125
sdh_configure --with-gaproot="$GAP_ROOT" ${pararr[$parind]}
125126
((parind+=1))
126-
sdh_make -j1
127+
sdh_make
127128
install_compiled_pkg "$pkg"
128129
cd "$PKG_SRC_DIR"
129130
done

‎build/pkgs/givaro/checksums.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=givaro-VERSION.tar.gz
2-
sha1=73ef15ca34c6f1c9f61013d2bd7d4d547e3ace14
3-
sha256=865e228812feca971dfb6e776a7bc7ac959cf63ebd52b4f05492730a46e1f189
2+
sha1=e666ec88a10f333158df09a9f0c23078d99282d9
3+
sha256=feefb7445842ceb756f8bb13900d975b530551e488a2ae174bda7b636251de43
44
upstream_url=https://github.com/linbox-team/givaro/releases/download/vVERSION/givaro-VERSION.tar.gz

‎build/pkgs/givaro/package-version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.2.0
1+
4.2.1

‎build/pkgs/givaro/patches/197.patch

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎build/pkgs/givaro/patches/218.patch

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎build/pkgs/givaro/patches/226.patch

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎build/pkgs/sage_conf/version_requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
# This file is updated on every release by the sage-update-version script
2-
sage-conf ~= 10.7b1
1+
# This file is updated on every release by the update-version script
2+
sage-conf ~= 10.7b2

‎build/pkgs/sage_docbuild/version_requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
# This file is updated on every release by the sage-update-version script
2-
sage-docbuild ~= 10.7b1
1+
# This file is updated on every release by the update-version script
2+
sage-docbuild ~= 10.7b2

‎build/pkgs/sage_setup/version_requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
# This file is updated on every release by the sage-update-version script
2-
sage-setup ~= 10.7b1
1+
# This file is updated on every release by the update-version script
2+
sage-setup ~= 10.7b2

‎build/pkgs/sage_sws2rst/version_requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
# This file is updated on every release by the sage-update-version script
2-
sage-sws2rst ~= 10.7b1
1+
# This file is updated on every release by the update-version script
2+
sage-sws2rst ~= 10.7b2

0 commit comments

Comments
 (0)