Skip to content

Commit d44d0de

Browse files
authored
Merge branch 'develop' into rand
2 parents aa7dae1 + 8aa7213 commit d44d0de

File tree

446 files changed

+9270
-8549
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

446 files changed

+9270
-8549
lines changed

.github/workflows/ci-conda.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,6 @@ jobs:
5151
bash ~/miniconda.sh -b -p $HOME/miniconda
5252
echo "CONDA=$HOME/miniconda" >> $GITHUB_ENV
5353
54-
# Workaround for https://github.com/actions/runner-images/issues/6910 / https://github.com/conda/conda/issues/12303
55-
- name: Downgrade conda
56-
if: matrix.os == 'ubuntu-latest'
57-
run: |
58-
conda config --set allow_conda_downgrades true
59-
conda install conda=4.12.0 -y
60-
6154
- name: Create conda environment files
6255
run: ./bootstrap-conda
6356

@@ -90,7 +83,7 @@ jobs:
9083
run: |
9184
./bootstrap
9285
echo "::add-matcher::.github/workflows/configure-systempackage-problem-matcher.json"
93-
./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)
86+
./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)
9487
echo "::remove-matcher owner=configure-system-package-warning::"
9588
echo "::remove-matcher owner=configure-system-package-error::"
9689

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
with:
4040
stage: ii-b
4141
previous_stages: i-*
42-
targets: singular maxima gap pari gfan palp flintqs arb ecm givaro
42+
targets: singular maxima gap pari gfan palp arb ecm givaro
4343
needs: [cygwin-stage-i-a, cygwin-stage-i-b]
4444

4545
cygwin-stage-ii-c:

.zenodo.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"description": "Mirror of the Sage https://sagemath.org/ source tree",
33
"license": "other-open",
4-
"title": "sagemath/sage: 10.0.beta8",
5-
"version": "10.0.beta8",
4+
"title": "sagemath/sage: 10.0.rc2",
5+
"version": "10.0.rc2",
66
"upload_type": "software",
7-
"publication_date": "2023-04-06",
7+
"publication_date": "2023-05-07",
88
"creators": [
99
{
1010
"affiliation": "SageMath.org",
@@ -15,7 +15,7 @@
1515
"related_identifiers": [
1616
{
1717
"scheme": "url",
18-
"identifier": "https://github.com/sagemath/sage/tree/10.0.beta8",
18+
"identifier": "https://github.com/sagemath/sage/tree/10.0.rc2",
1919
"relation": "isSupplementTo"
2020
},
2121
{

COPYING.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ elliptic_curves None (database)
5151
extcode GPLv2+
5252
fflas_ffpack LGPLv2.1+
5353
flint GPLv2+
54-
flintqs GPLv2+
5554
fplll LGPLv2.1+
5655
freetype FreeType License (similar to BSD; see below)
5756
gap GPLv2+

VERSION.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SageMath version 10.0.beta8, Release Date: 2023-04-06
1+
SageMath version 10.0.rc2, Release Date: 2023-05-07

build/pkgs/configure/checksums.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=configure-VERSION.tar.gz
2-
sha1=c809622a8c0b706231b5c8e02c0fb96b940e2a10
3-
md5=4ab2cb23636289210afe4a6743b36183
4-
cksum=1470715760
2+
sha1=d18a37f4dd7bcf8645cb1d34ab5de2b0f74e14c8
3+
md5=70a288640882b840de76a1b883897094
4+
cksum=3571416681
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
adaf3af26892f4a3720cc09d0e21c35281b472a3
1+
c1aea0aa2bcd7ab2e2f98f2a27a458809da1ce7e

build/pkgs/eclib/checksums.ini

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tarball=eclib-VERSION.tar.bz2
2-
sha1=7c8b64bd9a1b8f4f489690a53c1f329afc953f2c
3-
md5=03a87ae2b490f11b81ec6b305cbc8087
4-
cksum=111064162
5-
upstream_url=https://github.com/JohnCremona/eclib/releases/download/VERSION/eclib-VERSION.tar.bz2
2+
sha1=bd49acf96c4e7246c8ca3e5d188ae1b03a3aeff3
3+
md5=42721f2f1343c49dc774763a57a85ca6
4+
cksum=3624641360
5+
upstream_url=https://github.com/JohnCremona/eclib/releases/download/vVERSION/eclib-VERSION.tar.bz2

build/pkgs/eclib/package-version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20221012
1+
20230424

build/pkgs/eclib/spkg-configure.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
SAGE_SPKG_CONFIGURE([eclib], [
22
SAGE_SPKG_DEPCHECK([ntl pari flint], [
33
dnl Trac #31443, #34029: use existing eclib only if the version reported by pkg-config is correct
4-
m4_pushdef([SAGE_ECLIB_VER],["20221012"])
4+
m4_pushdef([SAGE_ECLIB_VER],["20230424"])
55
PKG_CHECK_MODULES([ECLIB], [eclib = SAGE_ECLIB_VER], [
66
AC_CACHE_CHECK([for mwrank version == SAGE_ECLIB_VER], [ac_cv_path_MWRANK], [
77
AC_PATH_PROGS_FEATURE_CHECK([MWRANK], [mwrank], [

0 commit comments

Comments
 (0)