Skip to content
This repository has been archived by the owner on Jan 30, 2023. It is now read-only.

Commit

Permalink
Merge #31584
Browse files Browse the repository at this point in the history
  • Loading branch information
Matthias Koeppe committed Mar 30, 2021
2 parents 3779a25 + 52537d1 commit ed1a089
Show file tree
Hide file tree
Showing 11 changed files with 23 additions and 27 deletions.
8 changes: 4 additions & 4 deletions .zenodo.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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"
},
{
Expand Down
2 changes: 1 addition & 1 deletion VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
SageMath version 9.3.rc0, Release Date: 2021-03-23
SageMath version 9.3.rc1, Release Date: 2021-03-29
6 changes: 3 additions & 3 deletions build/pkgs/configure/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=configure-VERSION.tar.gz
sha1=bb7050ca732ec30cabe28f018b0dfab43ea1ce0b
md5=a22a34d6f329fd4fafa7794eba219619
cksum=3797497074
sha1=df2f6839c4a19b7d21c4f387df24596fcfa2b459
md5=f307be6d68e25b3924cc93d2bcc9dc04
cksum=1158861891
2 changes: 1 addition & 1 deletion build/pkgs/configure/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5e86bf2b7a5873e9f42b32c43718a24d834b5abd
6e084f9dbad96c3a166732efb36fe71acd2e7ba2
6 changes: 3 additions & 3 deletions build/pkgs/cvxopt/spkg-install.in
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 1 addition & 5 deletions build/pkgs/numpy/spkg-install.in
Original file line number Diff line number Diff line change
Expand Up @@ -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"

################################################

Expand Down
2 changes: 1 addition & 1 deletion build/pkgs/sagelib/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9.3.rc0
9.3.rc1
4 changes: 2 additions & 2 deletions build/pkgs/suitesparse/spkg-configure.m4
Original file line number Diff line number Diff line change
Expand Up @@ -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, [''])
])
])
2 changes: 1 addition & 1 deletion src/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9.3.rc0
9.3.rc1
6 changes: 3 additions & 3 deletions src/bin/sage-version.sh
Original file line number Diff line number Diff line change
@@ -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'
6 changes: 3 additions & 3 deletions src/sage/version.py
Original file line number Diff line number Diff line change
@@ -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'

0 comments on commit ed1a089

Please sign in to comment.