Merge branch 'develop' into algebras/octonians

.github/workflows/ci-conda.yml

@@ -51,13 +51,6 @@ jobs:
           bash ~/miniconda.sh -b -p $HOME/miniconda
           echo "CONDA=$HOME/miniconda" >> $GITHUB_ENV
 
-      # Workaround for https://github.com/actions/runner-images/issues/6910 / https://github.com/conda/conda/issues/12303
-      - name: Downgrade conda
-        if: matrix.os == 'ubuntu-latest'
-        run: |
-          conda config --set allow_conda_downgrades true
-          conda install conda=4.12.0 -y
-
       - name: Create conda environment files
         run: ./bootstrap-conda
 
@@ -90,7 +83,7 @@ jobs:
         run: |
           ./bootstrap
           echo "::add-matcher::.github/workflows/configure-systempackage-problem-matcher.json"
-          ./configure --enable-build-as-root --with-python=$CONDA_PREFIX/bin/python --prefix=$CONDA_PREFIX $(for pkg in $(./sage -package list :standard: --has-file spkg-configure.m4 --has-file distros/conda.txt); do echo --with-system-$pkg=force; done)
+          ./configure --enable-build-as-root --with-python=$CONDA_PREFIX/bin/python --prefix=$CONDA_PREFIX $(for pkg in $(./sage -package list :standard: --has-file spkg-configure.m4 --has-file distros/conda.txt --exclude rpy2); do echo --with-system-$pkg=force; done)
           echo "::remove-matcher owner=configure-system-package-warning::"
           echo "::remove-matcher owner=configure-system-package-error::"
 

.github/workflows/ci-cygwin-standard.yml

@@ -39,7 +39,7 @@ jobs:
     with:
       stage: ii-b
       previous_stages: i-*
-      targets: singular maxima gap pari gfan palp flintqs arb ecm givaro
+      targets: singular maxima gap pari gfan palp arb ecm givaro
     needs: [cygwin-stage-i-a, cygwin-stage-i-b]
 
   cygwin-stage-ii-c:

.zenodo.json

@@ -1,10 +1,10 @@
 {
     "description": "Mirror of the Sage https://sagemath.org/ source tree", 
     "license": "other-open", 
-    "title": "sagemath/sage: 10.0.beta8", 
-    "version": "10.0.beta8", 
+    "title": "sagemath/sage: 10.0.rc2", 
+    "version": "10.0.rc2", 
     "upload_type": "software", 
-    "publication_date": "2023-04-06", 
+    "publication_date": "2023-05-07", 
     "creators": [
         {
             "affiliation": "SageMath.org", 
@@ -15,7 +15,7 @@
     "related_identifiers": [
         {
             "scheme": "url", 
-            "identifier": "https://github.com/sagemath/sage/tree/10.0.beta8", 
+            "identifier": "https://github.com/sagemath/sage/tree/10.0.rc2", 
             "relation": "isSupplementTo"
         }, 
         {

COPYING.txt

@@ -51,7 +51,6 @@ elliptic_curves             None (database)
 extcode                     GPLv2+
 fflas_ffpack                LGPLv2.1+
 flint                       GPLv2+
-flintqs                     GPLv2+
 fplll                       LGPLv2.1+
 freetype                    FreeType License (similar to BSD; see below)
 gap                         GPLv2+

VERSION.txt

@@ -1 +1 @@
-SageMath version 10.0.beta8, Release Date: 2023-04-06
+SageMath version 10.0.rc2, Release Date: 2023-05-07

build/pkgs/configure/checksums.ini

@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=c809622a8c0b706231b5c8e02c0fb96b940e2a10
-md5=4ab2cb23636289210afe4a6743b36183
-cksum=1470715760
+sha1=d18a37f4dd7bcf8645cb1d34ab5de2b0f74e14c8
+md5=70a288640882b840de76a1b883897094
+cksum=3571416681

build/pkgs/configure/package-version.txt

@@ -1 +1 @@
-adaf3af26892f4a3720cc09d0e21c35281b472a3
+c1aea0aa2bcd7ab2e2f98f2a27a458809da1ce7e

build/pkgs/eclib/checksums.ini

@@ -1,5 +1,5 @@
 tarball=eclib-VERSION.tar.bz2
-sha1=7c8b64bd9a1b8f4f489690a53c1f329afc953f2c
-md5=03a87ae2b490f11b81ec6b305cbc8087
-cksum=111064162
-upstream_url=https://github.com/JohnCremona/eclib/releases/download/VERSION/eclib-VERSION.tar.bz2
+sha1=bd49acf96c4e7246c8ca3e5d188ae1b03a3aeff3
+md5=42721f2f1343c49dc774763a57a85ca6
+cksum=3624641360
+upstream_url=https://github.com/JohnCremona/eclib/releases/download/vVERSION/eclib-VERSION.tar.bz2

build/pkgs/eclib/package-version.txt

@@ -1 +1 @@
-20221012
+20230424

build/pkgs/eclib/spkg-configure.m4

@@ -1,7 +1,7 @@
 SAGE_SPKG_CONFIGURE([eclib], [
   SAGE_SPKG_DEPCHECK([ntl pari flint], [
     dnl Trac #31443, #34029: use existing eclib only if the version reported by pkg-config is correct
-    m4_pushdef([SAGE_ECLIB_VER],["20221012"])
+    m4_pushdef([SAGE_ECLIB_VER],["20230424"])
     PKG_CHECK_MODULES([ECLIB], [eclib = SAGE_ECLIB_VER], [
       AC_CACHE_CHECK([for mwrank version == SAGE_ECLIB_VER], [ac_cv_path_MWRANK], [
         AC_PATH_PROGS_FEATURE_CHECK([MWRANK], [mwrank], [

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])
                 ])

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])
                     ])

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 {

build/pkgs/openblas/spkg-configure.m4

@@ -10,7 +10,7 @@ SAGE_SPKG_CONFIGURE([openblas], [
   dnl Reject openblas 0.3.22 - https://github.com/sagemath/sage/pull/35371
   m4_pushdef([SAGE_OPENBLAS_LT_VERSION_MAJOR], [0])
   m4_pushdef([SAGE_OPENBLAS_LT_VERSION_MINOR], [3])
-  m4_pushdef([SAGE_OPENBLAS_LT_VERSION_MICRO], [22])
+  m4_pushdef([SAGE_OPENBLAS_LT_VERSION_MICRO], [99])
   m4_pushdef([SAGE_OPENBLAS_LT_VERSION], [SAGE_OPENBLAS_LT_VERSION_MAJOR.SAGE_OPENBLAS_LT_VERSION_MINOR.SAGE_OPENBLAS_LT_VERSION_MICRO])
   PKG_CHECK_MODULES([OPENBLAS], [openblas >= ]SAGE_OPENBLAS_MIN_VERSION [openblas < ]SAGE_OPENBLAS_LT_VERSION, [
     LIBS="$OPENBLAS_LIBS $LIBS"
@@ -40,6 +40,21 @@ SAGE_SPKG_CONFIGURE([openblas], [
        AC_MSG_WARN([Unable to locate the directory of openblas.pc. This should not happen!])
        sage_spkg_install_openblas=yes
        ])
+     AS_IF([test x$sage_spkg_install_openblas != xyes], [
+       AC_MSG_CHECKING([the OpenBLAS version using openblas_get_config])
+       AC_LANG_PUSH([C])
+       AC_RUN_IFELSE([
+         dnl Reject 0.3.22 - see https://github.com/sagemath/sage/pull/35377
+         AC_LANG_PROGRAM([[#include <string.h>
+                           char *openblas_get_config(void); ]],
+                         [[if (!strncmp(openblas_get_config(), "OpenBLAS 0.3.22", 15)) return 1;]])
+       ], [
+         AC_MSG_RESULT([good])
+       ], [
+         AC_MSG_RESULT([known bad version])
+         sage_spkg_install_openblas=yes])
+       AC_LANG_POP([C])
+     ])
      AS_IF([test x$sage_spkg_install_openblas != xyes], [
         AC_SUBST([SAGE_SYSTEM_FACADE_PC_FILES])
         AC_SUBST([SAGE_OPENBLAS_PC_COMMAND], ["\$(LN) -sf \"$OPENBLASPCDIR/openblas.pc\" \"\$(@)\""])
@@ -66,6 +81,7 @@ SAGE_SPKG_CONFIGURE([openblas], [
                          AC_LANG_PUSH([C])
                          AC_RUN_IFELSE([
                            AC_LANG_PROGRAM([[#include <stdio.h>
+                                             #include <string.h>
                                              char *openblas_get_config(void);
                                              int version[3]; ]],
                                            [[version[0] = version[1] = version[2] = 0;
@@ -86,7 +102,8 @@ SAGE_SPKG_CONFIGURE([openblas], [
                                                  >=10000 * ]]SAGE_OPENBLAS_LT_VERSION_MAJOR[[
                                                    + 100 * ]]SAGE_OPENBLAS_LT_VERSION_MINOR[[
                                                          + ]]SAGE_OPENBLAS_LT_VERSION_MICRO[[)
-                                               return 1;]])
+                                               return 1;
+                                             if (!strncmp(openblas_get_config(), "OpenBLAS 0.3.22", 15)) return 1;]])
                          ], [AS_VAR_SET([HAVE_OPENBLAS], [yes])], [AS_VAR_SET([HAVE_OPENBLAS], [no])],
                             [AS_VAR_SET([HAVE_OPENBLAS], [yes])])
                          AC_LANG_POP([C])

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.0b8
+sage-conf ~= 10.0rc2

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.0b8
+sage-docbuild ~= 10.0rc2

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.0b8
+sage-setup ~= 10.0rc2

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.0b8
+sage-sws2rst ~= 10.0rc2

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.0b8
+sagelib ~= 10.0rc2

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.0b8
+sagemath-categories ~= 10.0rc2

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.0b8
+sagemath-environment ~= 10.0rc2

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.0b8
+sagemath-objects ~= 10.0rc2

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.0b8
+sagemath-repl ~= 10.0rc2

build/pkgs/scipy/patches/tests_no_internet_dependency.patch

@@ -0,0 +1,12 @@
+Disable tests in scipy/datasets, which require internet access.
+See https://github.com/scipy/scipy/pull/17965
+
+diff --git a/scipy/datasets/meson.build b/scipy/datasets/meson.build
+index 10137725381..132e8d29534 100644
+--- a/scipy/datasets/meson.build
++++ b/scipy/datasets/meson.build
+@@ -11,4 +11,3 @@ py3.install_sources(
+   subdir: 'scipy/datasets'
+ )
+
+-subdir('tests')

build/pkgs/sphinx_basic_ng/distros/conda.txt

@@ -0,0 +1 @@
+sphinx-basic-ng

build/pkgs/sphinx_copybutton/distros/conda.txt

@@ -0,0 +1 @@
+sphinx-copybutton

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
+ }

build/sage_bootstrap/app.py

@@ -305,7 +305,7 @@ def create(self, package_name, version=None, tarball=None, pkg_type=None, upstre
                     raise ValueError('Only platform-independent wheels can be used for wheel packages, got {0}'.format(tarball))
                 if not version:
                     version = pypi_version.version
-                upstream_url = 'https://pypi.io/packages/py3/{0:1.1}/{0}/{1}'.format(package_name, tarball)
+                upstream_url = 'https://pypi.io/packages/{2}/{0:1.1}/{0}/{1}'.format(package_name, tarball, pypi_version.python_version)
             if not description:
                 description = pypi_version.summary
             if not license: