Skip to content

Commit 535f4b8

Browse files
user202729user202729
committed
Merge remote-tracking branch 'upstream/develop' into doc-makeflags-ninja-note
2 parents 777930f + 766c7a0 commit 535f4b8

File tree

301 files changed

+4425
-2090
lines changed

Some content is hidden

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

301 files changed

+4425
-2090
lines changed

‎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.6.beta5
7+
version: 10.6.beta6
88
doi: 10.5281/zenodo.8042260
9-
date-released: 2025-01-26
9+
date-released: 2025-02-10
1010
repository-code: "https://github.com/sagemath/sage"
1111
url: "https://www.sagemath.org/"

‎Makefile

+14-2
Original file line numberDiff line numberDiff line change
@@ -253,9 +253,19 @@ TEST_TARGET = $@
253253

254254
TEST = ./sage -t --logfile=$(TEST_LOG) $(TEST_FLAGS) --optional=$(TEST_OPTIONAL) $(TEST_FILES)
255255

256+
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
264+
256265
test: all
257266
@echo '### make $(TEST_TARGET): Running $(TEST)' >> $(TEST_LOG)
258-
$(TEST)
267+
$(TEST); \
268+
$(MAKE) test-git-no-uncommitted-changes
259269

260270
check:
261271
@$(MAKE) test
@@ -302,7 +312,8 @@ ptestoptionallong:
302312
test-nodoc: TEST_OPTIONAL := $(TEST_OPTIONAL),!sagemath_doc_html,!sagemath_doc_pdf
303313
test-nodoc: build
304314
@echo '### make $(TEST_TARGET): Running $(TEST)' >> $(TEST_LOG)
305-
$(TEST)
315+
$(TEST); \
316+
$(MAKE) test-git-no-uncommitted-changes
306317

307318
check-nodoc:
308319
@$(MAKE) test-nodoc
@@ -387,5 +398,6 @@ list:
387398
misc-clean bdist-clean distclean bootstrap-clean maintainer-clean \
388399
test check testoptional testall testlong testoptionallong testallong \
389400
ptest ptestoptional ptestall ptestlong ptestoptionallong ptestallong \
401+
test-git-no-uncommitted-changes \
390402
list \
391403
doc-clean clean sagelib-clean build-clean

‎VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SageMath version 10.6.beta5, Release Date: 2025-01-26
1+
SageMath version 10.6.beta6, Release Date: 2025-02-10

‎build/pkgs/configure/checksums.ini

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
tarball=configure-VERSION.tar.gz
2-
sha1=86711d4cbef2cd4e7bb4afcde36965e5dea908e0
3-
sha256=9793cf92ebdceb09050a585294de93c242c033745a0012cae1bd301d307a45df
2+
sha1=db7e875cd888f974f7de2c038b2ae75ea5a31b1b
3+
sha256=c905a38a83d6f718258cab25cb643c574fdb600016605c5e252584271bf6ac53

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
efc0914cd8d72a9bdfdcca4511b55e290b9b6674
1+
00c302e55c156a7dd678229ff976ed90ce3d5161

‎build/pkgs/fplll/checksums.ini

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=fplll-VERSION.tar.gz
2-
sha1=607f5922109d93ddd5a05419682511e26579f9d6
3-
sha256=76d3778f0326597ed7505bab19493a9bf6b73a5c5ca614e8fb82f42105c57d00
2+
sha1=b40beea04697cccb26c9e6140935039ef87371df
3+
sha256=f0af6bdd0ebd5871e87ff3ef7737cb5360b1e38181a4e5a8c1236f3476fec3b2
44
upstream_url=https://github.com/fplll/fplll/releases/download/VERSION/fplll-VERSION.tar.gz

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5.4.5
1+
5.5.0

‎build/pkgs/fplll/spkg-configure.m4

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ SAGE_SPKG_CONFIGURE([fplll], [
88
dnl Issue #31025: FPLLL/FPyLLL make no guarantee regarding compatibility
99
dnl other than "whatever versions were released at the same time should work together"
1010
PKG_CHECK_MODULES([FPLLL],
11-
[fplll >= 5.4.5 fplll <= 5.4.5],
11+
[fplll >= 5.5.0],
1212
[
1313
AC_MSG_CHECKING([whether BKZ default strategy JSON is installed])
1414
AC_LANG_PUSH([C++])

‎build/pkgs/fpylll/checksums.ini

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=fpylll-VERSION.tar.gz
2-
sha1=c0bcf8c5583ebf614da9b26710a2c835d498bf34
3-
sha256=dfd9529a26c50993a2a716177debd7994312219070574cad31b35b4f0c040a19
2+
sha1=9399eea85c3f4cbd0dc33893532a324adc905d4e
3+
sha256=a3f4049e1c27b52136f71f722312c4265e3a2dcb5722536ec8247d708dd4248a
44
upstream_url=https://files.pythonhosted.org/packages/source/f/fpylll/fpylll-VERSION.tar.gz

‎build/pkgs/fpylll/dependencies

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cython cysignals numpy fplll | $(PYTHON_TOOLCHAIN) $(PYTHON)
1+
cython cysignals numpy fplll | $(PYTHON_TOOLCHAIN) $(PYTHON)
22

33
----------
44
All lines of this file are ignored except the first.

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.6.1
1+
0.6.3

‎build/pkgs/gap/checksums.ini

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=gap-VERSION.tar.gz
2-
sha1=cf91834954849dbaeae17079a4c4565bc28d03a8
3-
sha256=9794dbdba6fb998e0a2d0aa8ce21fc8848ad3d3f9cc9993b0b8e20be7e1dbeba
2+
sha1=403c261db32049cc124b8f43221f7c57f2616133
3+
sha256=845f5272c26feb1b8eb9ef294bf0545f264c1fe5a19b0601bbc65d79d9506487
44
upstream_url=https://github.com/gap-system/gap/releases/download/vVERSION/gap-VERSION.tar.gz

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.13.1
1+
4.14.0

‎build/pkgs/gap/patches/0001-Makefile.rules-Darwin-Remove-use-of-single_module-ob.patch

-29
This file was deleted.

‎build/pkgs/gap/patches/gap-4.13.1-hash-fixes.patch

-178
This file was deleted.

‎build/pkgs/gap/spkg-check.in

+1-27
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,3 @@
11
cd src
22

3-
# #28728: Fix test failure in tst/testinstall/strings.tst
4-
export LC_CTYPE=en_US.UTF-8
5-
6-
# #34391: in GAP 4.12 some packages need GAP package io
7-
# to let tests run, otherwise this hangs. Thus we install io here.
8-
cd pkg/io
9-
./configure --with-gaproot=../..
10-
make
11-
cd ../..
12-
13-
# This is the same as 'dev/ci.sh testinstall' (but dev/ci.sh is not part of the GAP tarball)
14-
./gap tst/testinstall.g
15-
if [[ $? -ne 0 ]]; then
16-
exit 1
17-
fi
18-
19-
LOG=dev/log/testinstall2_*
20-
21-
echo "================================================================"
22-
echo "Test log:"
23-
cat $LOG
24-
echo "================================================================"
25-
26-
ERRORS=`grep ^##### $LOG`
27-
if [[ ! -z "$ERRORS" ]]; then
28-
exit 1
29-
fi
3+
$MAKE check

‎build/pkgs/h11/spkg-configure.m4

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
SAGE_SPKG_CONFIGURE([h11], [SAGE_PYTHON_PACKAGE_CHECK([h11])])

‎build/pkgs/sage_conf/version_requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# This file is updated on every release by the sage-update-version script
2-
sage-conf ~= 10.6b5
2+
sage-conf ~= 10.6b6

‎build/pkgs/sage_docbuild/version_requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# This file is updated on every release by the sage-update-version script
2-
sage-docbuild ~= 10.6b5
2+
sage-docbuild ~= 10.6b6

‎build/pkgs/sage_setup/version_requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# This file is updated on every release by the sage-update-version script
2-
sage-setup ~= 10.6b5
2+
sage-setup ~= 10.6b6

‎build/pkgs/sage_sws2rst/version_requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# This file is updated on every release by the sage-update-version script
2-
sage-sws2rst ~= 10.6b5
2+
sage-sws2rst ~= 10.6b6

‎build/pkgs/sagelib/version_requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# This file is updated on every release by the sage-update-version script
2-
sagemath-standard ~= 10.6b5
2+
sagemath-standard ~= 10.6b6

‎build/pkgs/sagemath_bliss/version_requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# This file is updated on every release by the sage-update-version script
2-
sagemath-bliss ~= 10.6b5
2+
sagemath-bliss ~= 10.6b6

‎build/pkgs/sagemath_categories/version_requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# This file is updated on every release by the sage-update-version script
2-
sagemath-categories ~= 10.6b5
2+
sagemath-categories ~= 10.6b6

‎build/pkgs/sagemath_coxeter3/version_requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# This file is updated on every release by the sage-update-version script
2-
sagemath-coxeter3 ~= 10.6b5
2+
sagemath-coxeter3 ~= 10.6b6

‎build/pkgs/sagemath_environment/version_requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# This file is updated on every release by the sage-update-version script
2-
sagemath-environment ~= 10.6b5
2+
sagemath-environment ~= 10.6b6

‎build/pkgs/sagemath_mcqd/version_requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# This file is updated on every release by the sage-update-version script
2-
sagemath-mcqd ~= 10.6b5
2+
sagemath-mcqd ~= 10.6b6

‎build/pkgs/sagemath_meataxe/version_requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# This file is updated on every release by the sage-update-version script
2-
sagemath-meataxe ~= 10.6b5
2+
sagemath-meataxe ~= 10.6b6

‎build/pkgs/sagemath_objects/version_requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# This file is updated on every release by the sage-update-version script
2-
sagemath-objects ~= 10.6b5
2+
sagemath-objects ~= 10.6b6

‎build/pkgs/sagemath_repl/version_requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# This file is updated on every release by the sage-update-version script
2-
sagemath-repl ~= 10.6b5
2+
sagemath-repl ~= 10.6b6

0 commit comments

Comments
 (0)