Merge #31584

Author: Matthias Koeppe

.zenodo.json

@@ -1,10 +1,10 @@
 {
     "description": "Mirror of the Sage https://sagemath.org/ source tree", 
     "license": "other-open", 
-    "title": "sagemath/sage: 9.3.rc0", 
-    "version": "9.3.rc0", 
+    "title": "sagemath/sage: 9.3.rc1", 
+    "version": "9.3.rc1", 
     "upload_type": "software", 
-    "publication_date": "2021-03-23", 
+    "publication_date": "2021-03-29", 
     "creators": [
         {
             "affiliation": "SageMath.org", 
@@ -15,7 +15,7 @@
     "related_identifiers": [
         {
             "scheme": "url", 
-            "identifier": "https://github.com/sagemath/sage/tree/9.3.rc0", 
+            "identifier": "https://github.com/sagemath/sage/tree/9.3.rc1", 
             "relation": "isSupplementTo"
         }, 
         {

VERSION.txt

@@ -1 +1 @@
-SageMath version 9.3.rc0, Release Date: 2021-03-23
+SageMath version 9.3.rc1, Release Date: 2021-03-29

build/pkgs/configure/checksums.ini

@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=bb7050ca732ec30cabe28f018b0dfab43ea1ce0b
-md5=a22a34d6f329fd4fafa7794eba219619
-cksum=3797497074
+sha1=df2f6839c4a19b7d21c4f387df24596fcfa2b459
+md5=f307be6d68e25b3924cc93d2bcc9dc04
+cksum=1158861891

build/pkgs/configure/package-version.txt

@@ -1 +1 @@
-5e86bf2b7a5873e9f42b32c43718a24d834b5abd
+6e084f9dbad96c3a166732efb36fe71acd2e7ba2

build/pkgs/cvxopt/spkg-install.in

@@ -65,9 +65,9 @@ export CVXOPT_BLAS_LIB="$(cvxopt_output l blas)"
 export CVXOPT_BLAS_LIB_DIR="$(pkg-config --variable=libdir blas)"
 export CVXOPT_LAPACK_LIB="$(cvxopt_output l lapack)"
 
-if test "x$SAGE_SUITESPARSE_LOCALINSTALL" != "x"; then
-   export CVXOPT_SUITESPARSE_LIB_DIR="${SAGE_LOCAL}"
-   export CVXOPT_SUITESPARSE_INC_DIR="${SAGE_LOCAL}/include"
+if test "x$SAGE_SUITESPARSE_PREFIX" != "x"; then
+   export CVXOPT_SUITESPARSE_LIB_DIR="${SAGE_SUITESPARSE_PREFIX}"
+   export CVXOPT_SUITESPARSE_INC_DIR="${SAGE_SUITESPARSE_PREFIX}/include"
 fi
 
 export CVXOPT_BUILD_GLPK=1

build/pkgs/numpy/spkg-install.in

@@ -22,11 +22,7 @@ python3 ../lapack_conf.py
 export FFLAGS="$FFLAGS -fPIC"
 export FCFLAGS="$FCFLAGS -fPIC"
 
-if [ "$SAGE_FAT_BINARY" = "yes" ]; then
-    export NUMPY_FCONFIG="config_fc --noopt --noarch --cpu-dispatch=\"min\""
-else
-    export NUMPY_FCONFIG="config_fc --noopt --noarch"
-fi
+export NUMPY_FCONFIG="config_fc --noopt --noarch"
 
 ################################################
 

build/pkgs/sagelib/package-version.txt

@@ -1 +1 @@
-9.3.rc0
+9.3.rc1

build/pkgs/suitesparse/spkg-configure.m4

@@ -17,8 +17,8 @@ SAGE_SPKG_CONFIGURE([suitesparse], [
       sage_spkg_install_suitesparse=yes])
 ], [], [], [
     AS_IF([test x$sage_spkg_install_suitesparse = xyes], [
-       AC_SUBST(SAGE_SUITESPARSE_LOCALINSTALL, ['$SAGE_LOCAL'])
+       AC_SUBST(SAGE_SUITESPARSE_PREFIX, ['$SAGE_LOCAL'])
     ], [
-       AC_SUBST(SAGE_SUITESPARSE_LOCALINSTALL, [''])
+       AC_SUBST(SAGE_SUITESPARSE_PREFIX, [''])
     ])
 ])

src/VERSION.txt

@@ -1 +1 @@
-9.3.rc0
+9.3.rc1

src/bin/sage-version.sh

@@ -1,5 +1,5 @@
 # Sage version information for shell scripts
 # This file is auto-generated by the sage-update-version script, do not edit!
-SAGE_VERSION='9.3.rc0'
-SAGE_RELEASE_DATE='2021-03-23'
-SAGE_VERSION_BANNER='SageMath version 9.3.rc0, Release Date: 2021-03-23'
+SAGE_VERSION='9.3.rc1'
+SAGE_RELEASE_DATE='2021-03-29'
+SAGE_VERSION_BANNER='SageMath version 9.3.rc1, Release Date: 2021-03-29'

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 = '9.3.rc0'
-date = '2021-03-23'
-banner = 'SageMath version 9.3.rc0, Release Date: 2021-03-23'
+version = '9.3.rc1'
+date = '2021-03-29'
+banner = 'SageMath version 9.3.rc1, Release Date: 2021-03-29'