Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/develop' into polynomial-ring-…
Browse files Browse the repository at this point in the history
…iter
  • Loading branch information
user202729 committed Feb 11, 2025
2 parents 3667b7b + 766c7a0 commit 869d166
Show file tree
Hide file tree
Showing 301 changed files with 4,425 additions and 2,090 deletions.
4 changes: 2 additions & 2 deletions CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ title: SageMath
abstract: SageMath is a free open-source mathematics software system.
authors:
- name: "The SageMath Developers"
version: 10.6.beta5
version: 10.6.beta6
doi: 10.5281/zenodo.8042260
date-released: 2025-01-26
date-released: 2025-02-10
repository-code: "https://github.com/sagemath/sage"
url: "https://www.sagemath.org/"
16 changes: 14 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -253,9 +253,19 @@ TEST_TARGET = $@

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

test-git-no-uncommitted-changes:
@UNCOMMITTED=$$(git status --porcelain); \
if [ -n "$$UNCOMMITTED" ]; then \
echo "Error: the git repo has uncommitted changes:"; \
echo "$$UNCOMMITTED"; \
echo; \
exit 1; \
fi

test: all
@echo '### make $(TEST_TARGET): Running $(TEST)' >> $(TEST_LOG)
$(TEST)
$(TEST); \
$(MAKE) test-git-no-uncommitted-changes

check:
@$(MAKE) test
Expand Down Expand Up @@ -302,7 +312,8 @@ ptestoptionallong:
test-nodoc: TEST_OPTIONAL := $(TEST_OPTIONAL),!sagemath_doc_html,!sagemath_doc_pdf
test-nodoc: build
@echo '### make $(TEST_TARGET): Running $(TEST)' >> $(TEST_LOG)
$(TEST)
$(TEST); \
$(MAKE) test-git-no-uncommitted-changes

check-nodoc:
@$(MAKE) test-nodoc
Expand Down Expand Up @@ -387,5 +398,6 @@ list:
misc-clean bdist-clean distclean bootstrap-clean maintainer-clean \
test check testoptional testall testlong testoptionallong testallong \
ptest ptestoptional ptestall ptestlong ptestoptionallong ptestallong \
test-git-no-uncommitted-changes \
list \
doc-clean clean sagelib-clean build-clean
2 changes: 1 addition & 1 deletion VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
SageMath version 10.6.beta5, Release Date: 2025-01-26
SageMath version 10.6.beta6, Release Date: 2025-02-10
4 changes: 2 additions & 2 deletions build/pkgs/configure/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
tarball=configure-VERSION.tar.gz
sha1=86711d4cbef2cd4e7bb4afcde36965e5dea908e0
sha256=9793cf92ebdceb09050a585294de93c242c033745a0012cae1bd301d307a45df
sha1=db7e875cd888f974f7de2c038b2ae75ea5a31b1b
sha256=c905a38a83d6f718258cab25cb643c574fdb600016605c5e252584271bf6ac53
2 changes: 1 addition & 1 deletion build/pkgs/configure/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
efc0914cd8d72a9bdfdcca4511b55e290b9b6674
00c302e55c156a7dd678229ff976ed90ce3d5161
4 changes: 2 additions & 2 deletions build/pkgs/fplll/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=fplll-VERSION.tar.gz
sha1=607f5922109d93ddd5a05419682511e26579f9d6
sha256=76d3778f0326597ed7505bab19493a9bf6b73a5c5ca614e8fb82f42105c57d00
sha1=b40beea04697cccb26c9e6140935039ef87371df
sha256=f0af6bdd0ebd5871e87ff3ef7737cb5360b1e38181a4e5a8c1236f3476fec3b2
upstream_url=https://github.com/fplll/fplll/releases/download/VERSION/fplll-VERSION.tar.gz
2 changes: 1 addition & 1 deletion build/pkgs/fplll/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.4.5
5.5.0
2 changes: 1 addition & 1 deletion build/pkgs/fplll/spkg-configure.m4
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ SAGE_SPKG_CONFIGURE([fplll], [
dnl Issue #31025: FPLLL/FPyLLL make no guarantee regarding compatibility
dnl other than "whatever versions were released at the same time should work together"
PKG_CHECK_MODULES([FPLLL],
[fplll >= 5.4.5 fplll <= 5.4.5],
[fplll >= 5.5.0],
[
AC_MSG_CHECKING([whether BKZ default strategy JSON is installed])
AC_LANG_PUSH([C++])
Expand Down
4 changes: 2 additions & 2 deletions build/pkgs/fpylll/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=fpylll-VERSION.tar.gz
sha1=c0bcf8c5583ebf614da9b26710a2c835d498bf34
sha256=dfd9529a26c50993a2a716177debd7994312219070574cad31b35b4f0c040a19
sha1=9399eea85c3f4cbd0dc33893532a324adc905d4e
sha256=a3f4049e1c27b52136f71f722312c4265e3a2dcb5722536ec8247d708dd4248a
upstream_url=https://files.pythonhosted.org/packages/source/f/fpylll/fpylll-VERSION.tar.gz
2 changes: 1 addition & 1 deletion build/pkgs/fpylll/dependencies
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cython cysignals numpy fplll | $(PYTHON_TOOLCHAIN) $(PYTHON)
cython cysignals numpy fplll | $(PYTHON_TOOLCHAIN) $(PYTHON)

----------
All lines of this file are ignored except the first.
2 changes: 1 addition & 1 deletion build/pkgs/fpylll/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.6.1
0.6.3
4 changes: 2 additions & 2 deletions build/pkgs/gap/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=gap-VERSION.tar.gz
sha1=cf91834954849dbaeae17079a4c4565bc28d03a8
sha256=9794dbdba6fb998e0a2d0aa8ce21fc8848ad3d3f9cc9993b0b8e20be7e1dbeba
sha1=403c261db32049cc124b8f43221f7c57f2616133
sha256=845f5272c26feb1b8eb9ef294bf0545f264c1fe5a19b0601bbc65d79d9506487
upstream_url=https://github.com/gap-system/gap/releases/download/vVERSION/gap-VERSION.tar.gz
2 changes: 1 addition & 1 deletion build/pkgs/gap/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.13.1
4.14.0

This file was deleted.

178 changes: 0 additions & 178 deletions build/pkgs/gap/patches/gap-4.13.1-hash-fixes.patch

This file was deleted.

28 changes: 1 addition & 27 deletions build/pkgs/gap/spkg-check.in
Original file line number Diff line number Diff line change
@@ -1,29 +1,3 @@
cd src

# #28728: Fix test failure in tst/testinstall/strings.tst
export LC_CTYPE=en_US.UTF-8

# #34391: in GAP 4.12 some packages need GAP package io
# to let tests run, otherwise this hangs. Thus we install io here.
cd pkg/io
./configure --with-gaproot=../..
make
cd ../..

# This is the same as 'dev/ci.sh testinstall' (but dev/ci.sh is not part of the GAP tarball)
./gap tst/testinstall.g
if [[ $? -ne 0 ]]; then
exit 1
fi

LOG=dev/log/testinstall2_*

echo "================================================================"
echo "Test log:"
cat $LOG
echo "================================================================"

ERRORS=`grep ^##### $LOG`
if [[ ! -z "$ERRORS" ]]; then
exit 1
fi
$MAKE check
1 change: 1 addition & 0 deletions build/pkgs/h11/spkg-configure.m4
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
SAGE_SPKG_CONFIGURE([h11], [SAGE_PYTHON_PACKAGE_CHECK([h11])])
2 changes: 1 addition & 1 deletion build/pkgs/sage_conf/version_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This file is updated on every release by the sage-update-version script
sage-conf ~= 10.6b5
sage-conf ~= 10.6b6
2 changes: 1 addition & 1 deletion build/pkgs/sage_docbuild/version_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This file is updated on every release by the sage-update-version script
sage-docbuild ~= 10.6b5
sage-docbuild ~= 10.6b6
2 changes: 1 addition & 1 deletion build/pkgs/sage_setup/version_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This file is updated on every release by the sage-update-version script
sage-setup ~= 10.6b5
sage-setup ~= 10.6b6
2 changes: 1 addition & 1 deletion build/pkgs/sage_sws2rst/version_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This file is updated on every release by the sage-update-version script
sage-sws2rst ~= 10.6b5
sage-sws2rst ~= 10.6b6
2 changes: 1 addition & 1 deletion build/pkgs/sagelib/version_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This file is updated on every release by the sage-update-version script
sagemath-standard ~= 10.6b5
sagemath-standard ~= 10.6b6
2 changes: 1 addition & 1 deletion build/pkgs/sagemath_bliss/version_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This file is updated on every release by the sage-update-version script
sagemath-bliss ~= 10.6b5
sagemath-bliss ~= 10.6b6
2 changes: 1 addition & 1 deletion build/pkgs/sagemath_categories/version_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This file is updated on every release by the sage-update-version script
sagemath-categories ~= 10.6b5
sagemath-categories ~= 10.6b6
2 changes: 1 addition & 1 deletion build/pkgs/sagemath_coxeter3/version_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This file is updated on every release by the sage-update-version script
sagemath-coxeter3 ~= 10.6b5
sagemath-coxeter3 ~= 10.6b6
2 changes: 1 addition & 1 deletion build/pkgs/sagemath_environment/version_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This file is updated on every release by the sage-update-version script
sagemath-environment ~= 10.6b5
sagemath-environment ~= 10.6b6
2 changes: 1 addition & 1 deletion build/pkgs/sagemath_mcqd/version_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This file is updated on every release by the sage-update-version script
sagemath-mcqd ~= 10.6b5
sagemath-mcqd ~= 10.6b6
2 changes: 1 addition & 1 deletion build/pkgs/sagemath_meataxe/version_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This file is updated on every release by the sage-update-version script
sagemath-meataxe ~= 10.6b5
sagemath-meataxe ~= 10.6b6
2 changes: 1 addition & 1 deletion build/pkgs/sagemath_objects/version_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This file is updated on every release by the sage-update-version script
sagemath-objects ~= 10.6b5
sagemath-objects ~= 10.6b6
2 changes: 1 addition & 1 deletion build/pkgs/sagemath_repl/version_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This file is updated on every release by the sage-update-version script
sagemath-repl ~= 10.6b5
sagemath-repl ~= 10.6b6
Loading

0 comments on commit 869d166

Please sign in to comment.