Merge branch 'develop' of github.com:sagemath/sage into eclib

JohnCremona · JohnCremona · commit 5f14b39f834d · 2023-04-30T17:10:11.000+01:00
diff --git a/.zenodo.json b/.zenodo.json
@@ -1,10 +1,10 @@
 {
     "description": "Mirror of the Sage https://sagemath.org/ source tree", 
     "license": "other-open", 
-    "title": "sagemath/sage: 10.0.rc0", 
-    "version": "10.0.rc0", 
+    "title": "sagemath/sage: 10.0.rc1", 
+    "version": "10.0.rc1", 
     "upload_type": "software", 
-    "publication_date": "2023-04-23", 
+    "publication_date": "2023-04-28", 
     "creators": [
         {
             "affiliation": "SageMath.org", 
@@ -15,7 +15,7 @@
     "related_identifiers": [
         {
             "scheme": "url", 
-            "identifier": "https://github.com/sagemath/sage/tree/10.0.rc0", 
+            "identifier": "https://github.com/sagemath/sage/tree/10.0.rc1", 
             "relation": "isSupplementTo"
         }, 
         {
diff --git a/VERSION.txt b/VERSION.txt
@@ -1 +1 @@
-SageMath version 10.0.rc0, Release Date: 2023-04-23
+SageMath version 10.0.rc1, Release Date: 2023-04-28
diff --git a/build/pkgs/configure/checksums.ini b/build/pkgs/configure/checksums.ini
@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=527827bf6b3d445dc433219b4423f824dc95ec94
-md5=edf7a6212cc3e0f37acad73af1f059c8
-cksum=998886037
+sha1=20689ddae5ff8ac5bd6bc78c153683542f7b182a
+md5=921055919764dfaf581286c55acb1cba
+cksum=1549141056
diff --git a/build/pkgs/configure/package-version.txt b/build/pkgs/configure/package-version.txt
@@ -1 +1 @@
-eca2a773d086dbbd6c88bb36e2fac4748aa602bf
+9185befce0cf5e4c4cb83cce2034a55be95e03a7
diff --git a/build/pkgs/gcc/spkg-configure.m4 b/build/pkgs/gcc/spkg-configure.m4
@@ -165,8 +165,8 @@ SAGE_SPKG_CONFIGURE_BASE([gcc], [
                     # Install our own GCC if the system-provided one is older than gcc 8
                     SAGE_SHOULD_INSTALL_GCC([you have $CXX version $GXX_VERSION, which is quite old])
                 ],
-                [1[[3-9]].*], [
-                    # Install our own GCC if the system-provided one is newer than 12.x.
+                [1[[4-9]].*], [
+                    # Install our own GCC if the system-provided one is newer than 13.x.
                     # See https://github.com/sagemath/sage/issues/29456
                     SAGE_SHOULD_INSTALL_GCC([$CXX is g++ version $GXX_VERSION, which is too recent for this version of Sage])
                 ])
diff --git a/build/pkgs/gfortran/spkg-configure.m4 b/build/pkgs/gfortran/spkg-configure.m4
@@ -86,8 +86,8 @@ SAGE_SPKG_CONFIGURE([gfortran], [
                         # Install our own gfortran if the system-provided one is older than gcc-4.8.
                         SAGE_SHOULD_INSTALL_GFORTRAN([$FC is version $GFORTRAN_VERSION, which is quite old])
                     ],
-                    [1[[3-9]].*], [
-                        # Install our own gfortran if the system-provided one is newer than 12.x.
+                    [1[[4-9]].*], [
+                        # Install our own gfortran if the system-provided one is newer than 13.x.
                         # See https://github.com/sagemath/sage/issues/29456, https://github.com/sagemath/sage/issues/31838
                         SAGE_MUST_INSTALL_GFORTRAN([$FC is version $GFORTRAN_VERSION, which is too recent for this version of Sage])
                     ])
diff --git a/build/pkgs/givaro/patches/218.patch b/build/pkgs/givaro/patches/218.patch
@@ -0,0 +1,23 @@
+From c7744bb133496cd7ac04688f345646d505e1bf52 Mon Sep 17 00:00:00 2001
+From: "Benjamin A. Beasley" <code@musicinmybrain.net>
+Date: Thu, 19 Jan 2023 09:12:22 -0500
+Subject: [PATCH] Add missing #include <cstdint> for (u)int64_t
+
+Fixes failure to compile on GCC 13.
+---
+ src/library/poly1/givdegree.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/library/poly1/givdegree.h b/src/library/poly1/givdegree.h
+index 3753a425..eb85a0dd 100644
+--- a/src/library/poly1/givdegree.h
++++ b/src/library/poly1/givdegree.h
+@@ -19,6 +19,8 @@
+ #ifndef __GIVARO_poly1degree_H
+ #define __GIVARO_poly1degree_H
+ 
++#include <cstdint>
++
+ #include <iostream>
+ 
+ namespace Givaro {
diff --git a/build/pkgs/sage_conf/install-requires.txt b/build/pkgs/sage_conf/install-requires.txt
@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sage-conf ~= 10.0rc0
+sage-conf ~= 10.0rc1
diff --git a/build/pkgs/sage_docbuild/install-requires.txt b/build/pkgs/sage_docbuild/install-requires.txt
@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sage-docbuild ~= 10.0rc0
+sage-docbuild ~= 10.0rc1
diff --git a/build/pkgs/sage_setup/install-requires.txt b/build/pkgs/sage_setup/install-requires.txt
@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sage-setup ~= 10.0rc0
+sage-setup ~= 10.0rc1
diff --git a/build/pkgs/sage_sws2rst/install-requires.txt b/build/pkgs/sage_sws2rst/install-requires.txt
@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sage-sws2rst ~= 10.0rc0
+sage-sws2rst ~= 10.0rc1
diff --git a/build/pkgs/sagelib/install-requires.txt b/build/pkgs/sagelib/install-requires.txt
@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sagelib ~= 10.0rc0
+sagelib ~= 10.0rc1
diff --git a/build/pkgs/sagemath_categories/install-requires.txt b/build/pkgs/sagemath_categories/install-requires.txt
@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sagemath-categories ~= 10.0rc0
+sagemath-categories ~= 10.0rc1
diff --git a/build/pkgs/sagemath_environment/install-requires.txt b/build/pkgs/sagemath_environment/install-requires.txt
@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sagemath-environment ~= 10.0rc0
+sagemath-environment ~= 10.0rc1
diff --git a/build/pkgs/sagemath_objects/install-requires.txt b/build/pkgs/sagemath_objects/install-requires.txt
@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sagemath-objects ~= 10.0rc0
+sagemath-objects ~= 10.0rc1
diff --git a/build/pkgs/sagemath_repl/install-requires.txt b/build/pkgs/sagemath_repl/install-requires.txt
@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sagemath-repl ~= 10.0rc0
+sagemath-repl ~= 10.0rc1
diff --git a/build/pkgs/zeromq/patches/438d5d88392baffa6c2c5e0737d9de19d6686f0d.patch b/build/pkgs/zeromq/patches/438d5d88392baffa6c2c5e0737d9de19d6686f0d.patch
@@ -0,0 +1,58 @@
+From 438d5d88392baffa6c2c5e0737d9de19d6686f0d Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Tue, 20 Dec 2022 21:45:16 +0000
+Subject: [PATCH] src/secure_allocator.hpp: define missing 'rebind' type
+
+`gcc-13` added an assert to standard headers to make sure custom
+allocators have intended implementation of rebind type instead
+of inherited rebind. gcc change:
+    https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=64c986b49558a7
+
+Without the fix build fails on this week's `gcc-13` as:
+
+    [ 92%] Building CXX object tests/CMakeFiles/test_security_curve.dir/test_security_curve.cpp.o
+    In file included from /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/ext/alloc_traits.h:34,
+                     from /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/bits/stl_uninitialized.h:64,
+                     from /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/memory:69,
+                     from tests/../src/secure_allocator.hpp:42,
+                     from tests/../src/curve_client_tools.hpp:49,
+                     from tests/test_security_curve.cpp:53:
+    /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h: In instantiation of 'struct std::__allocator_traits_base::__rebind<zmq::secure_allocator_t<unsigned char>, unsigned char, void>':
+    /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h:94:11:   required by substitution of 'template<class _Alloc, class _Up> using std::__alloc_rebind = typename std::__allocator_traits_base::__rebind<_Alloc, _Up>::type [with _Alloc = zmq::secure_allocator_t<unsigned char>; _Up = unsigned char]'
+    /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h:228:8:   required by substitution of 'template<class _Alloc> template<class _Tp> using std::allocator_traits< <template-parameter-1-1> >::rebind_alloc = std::__alloc_rebind<_Alloc, _Tp> [with _Tp = unsigned char; _Alloc = zmq::secure_allocator_t<unsigned char>]'
+    /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/ext/alloc_traits.h:126:65:   required from 'struct __gnu_cxx::__alloc_traits<zmq::secure_allocator_t<unsigned char>, unsigned char>::rebind<unsigned char>'
+    /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/bits/stl_vector.h:88:21:   required from 'struct std::_Vector_base<unsigned char, zmq::secure_allocator_t<unsigned char> >'
+    /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/bits/stl_vector.h:423:11:   required from 'class std::vector<unsigned char, zmq::secure_allocator_t<unsigned char> >'
+    tests/../src/curve_client_tools.hpp:64:76:   required from here
+    /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h:70:31: error: static assertion failed: allocator_traits<A>::rebind_alloc<A::value_type> must be A
+       70 |                         _Tp>::value,
+          |                               ^~~~~
+
+The change adds trivial `rebind` definition with expected return type
+and satisfies conversion requirements.
+---
+ src/secure_allocator.hpp | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/src/secure_allocator.hpp b/src/secure_allocator.hpp
+index e0871dcc99..5e97368911 100644
+--- a/src/secure_allocator.hpp
++++ b/src/secure_allocator.hpp
+@@ -99,6 +99,17 @@ bool operator!= (const secure_allocator_t<T> &, const secure_allocator_t<U> &)
+ #else
+ template <typename T> struct secure_allocator_t : std::allocator<T>
+ {
++    secure_allocator_t () ZMQ_DEFAULT;
++
++    template <class U>
++    secure_allocator_t (const secure_allocator_t<U> &) ZMQ_NOEXCEPT
++    {
++    }
++
++    template <class U> struct rebind
++    {
++        typedef secure_allocator_t<U> other;
++    };
+ };
+ #endif
+ }
diff --git a/pkgs/sage-conf/VERSION.txt b/pkgs/sage-conf/VERSION.txt
@@ -1 +1 @@
-10.0.rc0
+10.0.rc1
diff --git a/pkgs/sage-conf_pypi/VERSION.txt b/pkgs/sage-conf_pypi/VERSION.txt
@@ -1 +1 @@
-10.0.rc0
+10.0.rc1
diff --git a/pkgs/sage-docbuild/VERSION.txt b/pkgs/sage-docbuild/VERSION.txt
@@ -1 +1 @@
-10.0.rc0
+10.0.rc1
diff --git a/pkgs/sage-setup/VERSION.txt b/pkgs/sage-setup/VERSION.txt
@@ -1 +1 @@
-10.0.rc0
+10.0.rc1
diff --git a/pkgs/sage-sws2rst/VERSION.txt b/pkgs/sage-sws2rst/VERSION.txt
@@ -1 +1 @@
-10.0.rc0
+10.0.rc1
diff --git a/pkgs/sagemath-categories/VERSION.txt b/pkgs/sagemath-categories/VERSION.txt
@@ -1 +1 @@
-10.0.rc0
+10.0.rc1
diff --git a/pkgs/sagemath-environment/VERSION.txt b/pkgs/sagemath-environment/VERSION.txt
@@ -1 +1 @@
-10.0.rc0
+10.0.rc1
diff --git a/pkgs/sagemath-objects/VERSION.txt b/pkgs/sagemath-objects/VERSION.txt
@@ -1 +1 @@
-10.0.rc0
+10.0.rc1
diff --git a/pkgs/sagemath-repl/VERSION.txt b/pkgs/sagemath-repl/VERSION.txt
@@ -1 +1 @@
-10.0.rc0
+10.0.rc1
diff --git a/src/VERSION.txt b/src/VERSION.txt
@@ -1 +1 @@
-10.0.rc0
+10.0.rc1
diff --git a/src/bin/sage-version.sh b/src/bin/sage-version.sh
@@ -4,6 +4,6 @@
 # which stops "setup.py develop" from rewriting it as a Python file.
 :
 # This file is auto-generated by the sage-update-version script, do not edit!
-SAGE_VERSION='10.0.rc0'
-SAGE_RELEASE_DATE='2023-04-23'
-SAGE_VERSION_BANNER='SageMath version 10.0.rc0, Release Date: 2023-04-23'
+SAGE_VERSION='10.0.rc1'
+SAGE_RELEASE_DATE='2023-04-28'
+SAGE_VERSION_BANNER='SageMath version 10.0.rc1, Release Date: 2023-04-28'
diff --git a/src/sage/quadratic_forms/genera/genus.py b/src/sage/quadratic_forms/genera/genus.py
@@ -121,7 +121,8 @@ def genera(sig_pair, determinant, max_scale=None, even=False):
     return genera
 
 
-genera = staticmethod(genera)
+# #35557: In Python < 3.10, a staticmethod cannot be called directly
+_genera_staticmethod = staticmethod(genera)
 
 
 def _local_genera(p, rank, det_val, max_scale, even):
diff --git a/src/sage/quadratic_forms/quadratic_form.py b/src/sage/quadratic_forms/quadratic_form.py
@@ -502,9 +502,8 @@ class QuadraticForm(SageObject):
         ])
 
     # Genus
-    lazy_import("sage.quadratic_forms.genera.genus", [
-            "genera"
-        ])
+    lazy_import("sage.quadratic_forms.genera.genus",
+                "_genera_staticmethod", as_="genera")
 
     def __init__(self, R, n=None, entries=None, unsafe_initialization=False, number_of_automorphisms=None, determinant=None):
         """
diff --git a/src/sage/version.py b/src/sage/version.py
@@ -1,5 +1,5 @@
 # Sage version information for Python scripts
 # This file is auto-generated by the sage-update-version script, do not edit!
-version = '10.0.rc0'
-date = '2023-04-23'
-banner = 'SageMath version 10.0.rc0, Release Date: 2023-04-23'
+version = '10.0.rc1'
+date = '2023-04-28'
+banner = 'SageMath version 10.0.rc1, Release Date: 2023-04-28'

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`	`1`	`{`
`2`	`2`	`"description": "Mirror of the Sage https://sagemath.org/ source tree",`
`3`	`3`	`"license": "other-open",`
`4`		`- "title": "sagemath/sage: 10.0.rc0",`
`5`		`- "version": "10.0.rc0",`
	`4`	`+ "title": "sagemath/sage: 10.0.rc1",`
	`5`	`+ "version": "10.0.rc1",`
`6`	`6`	`"upload_type": "software",`
`7`		`- "publication_date": "2023-04-23",`
	`7`	`+ "publication_date": "2023-04-28",`
`8`	`8`	`"creators": [`
`9`	`9`	`{`
`10`	`10`	`"affiliation": "SageMath.org",`
`@@ -15,7 +15,7 @@`
`15`	`15`	`"related_identifiers": [`
`16`	`16`	`{`
`17`	`17`	`"scheme": "url",`
`18`		`- "identifier": "https://github.com/sagemath/sage/tree/10.0.rc0",`
	`18`	`+ "identifier": "https://github.com/sagemath/sage/tree/10.0.rc1",`
`19`	`19`	`"relation": "isSupplementTo"`
`20`	`20`	`},`
`21`	`21`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-SageMath version 10.0.rc0, Release Date: 2023-04-23`
	`1`	`+SageMath version 10.0.rc1, Release Date: 2023-04-28`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-eca2a773d086dbbd6c88bb36e2fac4748aa602bf`
	`1`	`+9185befce0cf5e4c4cb83cce2034a55be95e03a7`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`# This file is updated on every release by the sage-update-version script`
`2`		`-sage-conf ~= 10.0rc0`
	`2`	`+sage-conf ~= 10.0rc1`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`# This file is updated on every release by the sage-update-version script`
`2`		`-sage-docbuild ~= 10.0rc0`
	`2`	`+sage-docbuild ~= 10.0rc1`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`# This file is updated on every release by the sage-update-version script`
`2`		`-sage-setup ~= 10.0rc0`
	`2`	`+sage-setup ~= 10.0rc1`