diff --git a/.github/workflows/doc-build.yml b/.github/workflows/doc-build.yml index 8f749fed029..9fa05679873 100644 --- a/.github/workflows/doc-build.yml +++ b/.github/workflows/doc-build.yml @@ -196,7 +196,7 @@ jobs: (cd doc && git commit -a -m 'new') # Wipe out chronic diffs of new doc against old doc before creating CHANGES.html (cd doc && \ - find . -name "*.html" | xargs sed -i -e '/This is documentation of/ s/ built with GitHub PR .* for development/ for development/' \ + find . -name "*.html" | xargs sed -i -e '/This is documentation/ s/ built with GitHub PR .* for development/ for development/' \ -e '/;,\;; d' \ && git commit -a -m 'wipe-out') diff --git a/CITATION.cff b/CITATION.cff index b53541cf32c..0c89b3d28a4 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -4,8 +4,8 @@ title: SageMath abstract: SageMath is a free open-source mathematics software system. authors: - name: "The SageMath Developers" -version: 10.4.rc3 +version: 10.4.rc4 doi: 10.5281/zenodo.8042260 -date-released: 2024-07-12 +date-released: 2024-07-16 repository-code: "https://github.com/sagemath/sage" url: "https://www.sagemath.org/" diff --git a/VERSION.txt b/VERSION.txt index 46f68464285..9518b8878c3 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -SageMath version 10.4.rc3, Release Date: 2024-07-12 +SageMath version 10.4.rc4, Release Date: 2024-07-16 diff --git a/build/pkgs/configure/checksums.ini b/build/pkgs/configure/checksums.ini index 63e08ba92ce..f24b7f4a578 100644 --- a/build/pkgs/configure/checksums.ini +++ b/build/pkgs/configure/checksums.ini @@ -1,3 +1,3 @@ tarball=configure-VERSION.tar.gz -sha1=a78a0025292f4831f84dc059734320de0e66e216 -sha256=c108de2bfbbf3f2543ada5742d5bc9a58df700d8b6125df92b1888f867b60174 +sha1=f244bfc305954759170d5a5277e781ade6c50e46 +sha256=e09daf0ca707603d69d2dc6d5b033e8b9f8b155505567b3a9ab08bccd9aaf99a diff --git a/build/pkgs/configure/package-version.txt b/build/pkgs/configure/package-version.txt index bfc9d17635e..4c5a6a45407 100644 --- a/build/pkgs/configure/package-version.txt +++ b/build/pkgs/configure/package-version.txt @@ -1 +1 @@ -74119807d7989c879f2eee167e4e29af7c4f588a +01b4ec90d59e52e7adcad9eef773a136d372b39f diff --git a/build/pkgs/sage_conf/version_requirements.txt b/build/pkgs/sage_conf/version_requirements.txt index 811eed8d523..9b0cdef6049 100644 --- a/build/pkgs/sage_conf/version_requirements.txt +++ b/build/pkgs/sage_conf/version_requirements.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sage-conf ~= 10.4rc3 +sage-conf ~= 10.4rc4 diff --git a/build/pkgs/sage_docbuild/version_requirements.txt b/build/pkgs/sage_docbuild/version_requirements.txt index a18fb9a9ec3..d7e0e419ecb 100644 --- a/build/pkgs/sage_docbuild/version_requirements.txt +++ b/build/pkgs/sage_docbuild/version_requirements.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sage-docbuild ~= 10.4rc3 +sage-docbuild ~= 10.4rc4 diff --git a/build/pkgs/sage_numerical_backends_coin/checksums.ini b/build/pkgs/sage_numerical_backends_coin/checksums.ini index 53ebb086e1c..427dcedeb0a 100644 --- a/build/pkgs/sage_numerical_backends_coin/checksums.ini +++ b/build/pkgs/sage_numerical_backends_coin/checksums.ini @@ -1,4 +1,4 @@ tarball=sage_numerical_backends_coin-VERSION.tar.gz -sha1=5c9708603564c55fa5fddf66ac06f68f4c6145e2 -sha256=d48b7c550bc727f58ce28c03cc572f37e7e6267a0c73366aa6cf852c80af6a39 +sha1=2033e1ba209315366a6dbfe249d5de5f7a1bc1b0 +sha256=6e34d48632d070e97dc37b724098c0f050026b166b328af78929b1ea079fa9e7 upstream_url=https://pypi.io/packages/source/s/sage_numerical_backends_coin/sage_numerical_backends_coin-VERSION.tar.gz diff --git a/build/pkgs/sage_numerical_backends_coin/package-version.txt b/build/pkgs/sage_numerical_backends_coin/package-version.txt index 1700f7be00d..1be519cd2ec 100644 --- a/build/pkgs/sage_numerical_backends_coin/package-version.txt +++ b/build/pkgs/sage_numerical_backends_coin/package-version.txt @@ -1 +1 @@ -9.0b12 +10.4 diff --git a/build/pkgs/sage_numerical_backends_coin/spkg-install.in b/build/pkgs/sage_numerical_backends_coin/spkg-install.in index 058b1344dc2..1104ddad5cf 100644 --- a/build/pkgs/sage_numerical_backends_coin/spkg-install.in +++ b/build/pkgs/sage_numerical_backends_coin/spkg-install.in @@ -1,3 +1,3 @@ cd src -sdh_pip_install . +sdh_pip_install --no-build-isolation . diff --git a/build/pkgs/sage_numerical_backends_cplex/checksums.ini b/build/pkgs/sage_numerical_backends_cplex/checksums.ini index 633b6676b48..24a6756620a 100644 --- a/build/pkgs/sage_numerical_backends_cplex/checksums.ini +++ b/build/pkgs/sage_numerical_backends_cplex/checksums.ini @@ -1,4 +1,4 @@ tarball=sage_numerical_backends_cplex-VERSION.tar.gz -sha1=59b5f344f5b3d2e1f2fb7dcddef208bcc99e710a -sha256=4e4ce4464a26d1c0bb340273f0731f75b037550dc35afd143e95b94168f2eca1 +sha1=b7085bfdeecb55a43c799493672a228687c30eaf +sha256=367480d7a291e0ac4e3df529fbc2a17f78f3770ce7dc2cf78d765f72b7bd938e upstream_url=https://pypi.io/packages/source/s/sage_numerical_backends_cplex/sage_numerical_backends_cplex-VERSION.tar.gz diff --git a/build/pkgs/sage_numerical_backends_cplex/package-version.txt b/build/pkgs/sage_numerical_backends_cplex/package-version.txt index 1700f7be00d..1be519cd2ec 100644 --- a/build/pkgs/sage_numerical_backends_cplex/package-version.txt +++ b/build/pkgs/sage_numerical_backends_cplex/package-version.txt @@ -1 +1 @@ -9.0b12 +10.4 diff --git a/build/pkgs/sage_numerical_backends_cplex/spkg-install.in b/build/pkgs/sage_numerical_backends_cplex/spkg-install.in index 058b1344dc2..1104ddad5cf 100644 --- a/build/pkgs/sage_numerical_backends_cplex/spkg-install.in +++ b/build/pkgs/sage_numerical_backends_cplex/spkg-install.in @@ -1,3 +1,3 @@ cd src -sdh_pip_install . +sdh_pip_install --no-build-isolation . diff --git a/build/pkgs/sage_numerical_backends_gurobi/checksums.ini b/build/pkgs/sage_numerical_backends_gurobi/checksums.ini index 70dc24885c2..02b722b9bd2 100644 --- a/build/pkgs/sage_numerical_backends_gurobi/checksums.ini +++ b/build/pkgs/sage_numerical_backends_gurobi/checksums.ini @@ -1,4 +1,4 @@ tarball=sage_numerical_backends_gurobi-VERSION.tar.gz -sha1=36a2bfa1cfa2f4fdcb9dc979e80177580bb7aac2 -sha256=bb073ce2d7972aabafd2a074c46231204fe3a04d273b247ee9a03ca8938d17e0 +sha1=6891c154bd035932759152dba6a8bd77e8811f22 +sha256=3c3b51d6577f651d10cb7f6fc37ca4bb27c6fe2716d6515d1d23eeed1f34e32a upstream_url=https://pypi.io/packages/source/s/sage_numerical_backends_gurobi/sage_numerical_backends_gurobi-VERSION.tar.gz diff --git a/build/pkgs/sage_numerical_backends_gurobi/package-version.txt b/build/pkgs/sage_numerical_backends_gurobi/package-version.txt index 3b74042132a..1be519cd2ec 100644 --- a/build/pkgs/sage_numerical_backends_gurobi/package-version.txt +++ b/build/pkgs/sage_numerical_backends_gurobi/package-version.txt @@ -1 +1 @@ -9.3.1 +10.4 diff --git a/build/pkgs/sage_numerical_backends_gurobi/spkg-install.in b/build/pkgs/sage_numerical_backends_gurobi/spkg-install.in index 058b1344dc2..1104ddad5cf 100644 --- a/build/pkgs/sage_numerical_backends_gurobi/spkg-install.in +++ b/build/pkgs/sage_numerical_backends_gurobi/spkg-install.in @@ -1,3 +1,3 @@ cd src -sdh_pip_install . +sdh_pip_install --no-build-isolation . diff --git a/build/pkgs/sage_setup/version_requirements.txt b/build/pkgs/sage_setup/version_requirements.txt index 77676a0c3ad..f0527b41878 100644 --- a/build/pkgs/sage_setup/version_requirements.txt +++ b/build/pkgs/sage_setup/version_requirements.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sage-setup ~= 10.4rc3 +sage-setup ~= 10.4rc4 diff --git a/build/pkgs/sage_sws2rst/version_requirements.txt b/build/pkgs/sage_sws2rst/version_requirements.txt index 59c6b8fc2aa..caf10895b5f 100644 --- a/build/pkgs/sage_sws2rst/version_requirements.txt +++ b/build/pkgs/sage_sws2rst/version_requirements.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sage-sws2rst ~= 10.4rc3 +sage-sws2rst ~= 10.4rc4 diff --git a/build/pkgs/sagelib/version_requirements.txt b/build/pkgs/sagelib/version_requirements.txt index dddfa7072d7..e81b0caa3f0 100644 --- a/build/pkgs/sagelib/version_requirements.txt +++ b/build/pkgs/sagelib/version_requirements.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sagemath-standard ~= 10.4rc3 +sagemath-standard ~= 10.4rc4 diff --git a/build/pkgs/sagemath_bliss/version_requirements.txt b/build/pkgs/sagemath_bliss/version_requirements.txt index 37543bcefd2..6a119533ae1 100644 --- a/build/pkgs/sagemath_bliss/version_requirements.txt +++ b/build/pkgs/sagemath_bliss/version_requirements.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sagemath-bliss ~= 10.4rc3 +sagemath-bliss ~= 10.4rc4 diff --git a/build/pkgs/sagemath_categories/version_requirements.txt b/build/pkgs/sagemath_categories/version_requirements.txt index edf94bb961e..4c70ffbdfed 100644 --- a/build/pkgs/sagemath_categories/version_requirements.txt +++ b/build/pkgs/sagemath_categories/version_requirements.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sagemath-categories ~= 10.4rc3 +sagemath-categories ~= 10.4rc4 diff --git a/build/pkgs/sagemath_coxeter3/version_requirements.txt b/build/pkgs/sagemath_coxeter3/version_requirements.txt index cab69e16ea0..e65eeedc7de 100644 --- a/build/pkgs/sagemath_coxeter3/version_requirements.txt +++ b/build/pkgs/sagemath_coxeter3/version_requirements.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sagemath-coxeter3 ~= 10.4rc3 +sagemath-coxeter3 ~= 10.4rc4 diff --git a/build/pkgs/sagemath_environment/version_requirements.txt b/build/pkgs/sagemath_environment/version_requirements.txt index 5ea8e57e814..69b95ad2d2c 100644 --- a/build/pkgs/sagemath_environment/version_requirements.txt +++ b/build/pkgs/sagemath_environment/version_requirements.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sagemath-environment ~= 10.4rc3 +sagemath-environment ~= 10.4rc4 diff --git a/build/pkgs/sagemath_mcqd/version_requirements.txt b/build/pkgs/sagemath_mcqd/version_requirements.txt index 0906cad2352..8bfac5008fe 100644 --- a/build/pkgs/sagemath_mcqd/version_requirements.txt +++ b/build/pkgs/sagemath_mcqd/version_requirements.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sagemath-mcqd ~= 10.4rc3 +sagemath-mcqd ~= 10.4rc4 diff --git a/build/pkgs/sagemath_meataxe/version_requirements.txt b/build/pkgs/sagemath_meataxe/version_requirements.txt index 5dec45287be..8d6f5c4bde1 100644 --- a/build/pkgs/sagemath_meataxe/version_requirements.txt +++ b/build/pkgs/sagemath_meataxe/version_requirements.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sagemath-meataxe ~= 10.4rc3 +sagemath-meataxe ~= 10.4rc4 diff --git a/build/pkgs/sagemath_objects/version_requirements.txt b/build/pkgs/sagemath_objects/version_requirements.txt index 1da6c05c483..ae96a976196 100644 --- a/build/pkgs/sagemath_objects/version_requirements.txt +++ b/build/pkgs/sagemath_objects/version_requirements.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sagemath-objects ~= 10.4rc3 +sagemath-objects ~= 10.4rc4 diff --git a/build/pkgs/sagemath_repl/version_requirements.txt b/build/pkgs/sagemath_repl/version_requirements.txt index d8025f97bc3..a39db9a5da8 100644 --- a/build/pkgs/sagemath_repl/version_requirements.txt +++ b/build/pkgs/sagemath_repl/version_requirements.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sagemath-repl ~= 10.4rc3 +sagemath-repl ~= 10.4rc4 diff --git a/build/pkgs/sagemath_sirocco/version_requirements.txt b/build/pkgs/sagemath_sirocco/version_requirements.txt index a8e234444b3..91253ee595f 100644 --- a/build/pkgs/sagemath_sirocco/version_requirements.txt +++ b/build/pkgs/sagemath_sirocco/version_requirements.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sagemath-sirocco ~= 10.4rc3 +sagemath-sirocco ~= 10.4rc4 diff --git a/build/pkgs/sagemath_tdlib/version_requirements.txt b/build/pkgs/sagemath_tdlib/version_requirements.txt index 3dcfc30b890..32235cb25c2 100644 --- a/build/pkgs/sagemath_tdlib/version_requirements.txt +++ b/build/pkgs/sagemath_tdlib/version_requirements.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sagemath-tdlib ~= 10.4rc3 +sagemath-tdlib ~= 10.4rc4 diff --git a/pkgs/sage-conf/VERSION.txt b/pkgs/sage-conf/VERSION.txt index 7090b0bec63..674a81760a4 100644 --- a/pkgs/sage-conf/VERSION.txt +++ b/pkgs/sage-conf/VERSION.txt @@ -1 +1 @@ -10.4.rc3 +10.4.rc4 diff --git a/pkgs/sage-conf_conda/VERSION.txt b/pkgs/sage-conf_conda/VERSION.txt index 7090b0bec63..674a81760a4 100644 --- a/pkgs/sage-conf_conda/VERSION.txt +++ b/pkgs/sage-conf_conda/VERSION.txt @@ -1 +1 @@ -10.4.rc3 +10.4.rc4 diff --git a/pkgs/sage-conf_pypi/VERSION.txt b/pkgs/sage-conf_pypi/VERSION.txt index 7090b0bec63..674a81760a4 100644 --- a/pkgs/sage-conf_pypi/VERSION.txt +++ b/pkgs/sage-conf_pypi/VERSION.txt @@ -1 +1 @@ -10.4.rc3 +10.4.rc4 diff --git a/pkgs/sage-docbuild/VERSION.txt b/pkgs/sage-docbuild/VERSION.txt index 7090b0bec63..674a81760a4 100644 --- a/pkgs/sage-docbuild/VERSION.txt +++ b/pkgs/sage-docbuild/VERSION.txt @@ -1 +1 @@ -10.4.rc3 +10.4.rc4 diff --git a/pkgs/sage-setup/VERSION.txt b/pkgs/sage-setup/VERSION.txt index 7090b0bec63..674a81760a4 100644 --- a/pkgs/sage-setup/VERSION.txt +++ b/pkgs/sage-setup/VERSION.txt @@ -1 +1 @@ -10.4.rc3 +10.4.rc4 diff --git a/pkgs/sage-sws2rst/VERSION.txt b/pkgs/sage-sws2rst/VERSION.txt index 7090b0bec63..674a81760a4 100644 --- a/pkgs/sage-sws2rst/VERSION.txt +++ b/pkgs/sage-sws2rst/VERSION.txt @@ -1 +1 @@ -10.4.rc3 +10.4.rc4 diff --git a/pkgs/sagemath-bliss/VERSION.txt b/pkgs/sagemath-bliss/VERSION.txt index 7090b0bec63..674a81760a4 100644 --- a/pkgs/sagemath-bliss/VERSION.txt +++ b/pkgs/sagemath-bliss/VERSION.txt @@ -1 +1 @@ -10.4.rc3 +10.4.rc4 diff --git a/pkgs/sagemath-categories/VERSION.txt b/pkgs/sagemath-categories/VERSION.txt index 7090b0bec63..674a81760a4 100644 --- a/pkgs/sagemath-categories/VERSION.txt +++ b/pkgs/sagemath-categories/VERSION.txt @@ -1 +1 @@ -10.4.rc3 +10.4.rc4 diff --git a/pkgs/sagemath-coxeter3/VERSION.txt b/pkgs/sagemath-coxeter3/VERSION.txt index 7090b0bec63..674a81760a4 100644 --- a/pkgs/sagemath-coxeter3/VERSION.txt +++ b/pkgs/sagemath-coxeter3/VERSION.txt @@ -1 +1 @@ -10.4.rc3 +10.4.rc4 diff --git a/pkgs/sagemath-environment/VERSION.txt b/pkgs/sagemath-environment/VERSION.txt index 7090b0bec63..674a81760a4 100644 --- a/pkgs/sagemath-environment/VERSION.txt +++ b/pkgs/sagemath-environment/VERSION.txt @@ -1 +1 @@ -10.4.rc3 +10.4.rc4 diff --git a/pkgs/sagemath-mcqd/VERSION.txt b/pkgs/sagemath-mcqd/VERSION.txt index 7090b0bec63..674a81760a4 100644 --- a/pkgs/sagemath-mcqd/VERSION.txt +++ b/pkgs/sagemath-mcqd/VERSION.txt @@ -1 +1 @@ -10.4.rc3 +10.4.rc4 diff --git a/pkgs/sagemath-meataxe/VERSION.txt b/pkgs/sagemath-meataxe/VERSION.txt index 7090b0bec63..674a81760a4 100644 --- a/pkgs/sagemath-meataxe/VERSION.txt +++ b/pkgs/sagemath-meataxe/VERSION.txt @@ -1 +1 @@ -10.4.rc3 +10.4.rc4 diff --git a/pkgs/sagemath-objects/VERSION.txt b/pkgs/sagemath-objects/VERSION.txt index 7090b0bec63..674a81760a4 100644 --- a/pkgs/sagemath-objects/VERSION.txt +++ b/pkgs/sagemath-objects/VERSION.txt @@ -1 +1 @@ -10.4.rc3 +10.4.rc4 diff --git a/pkgs/sagemath-repl/VERSION.txt b/pkgs/sagemath-repl/VERSION.txt index 7090b0bec63..674a81760a4 100644 --- a/pkgs/sagemath-repl/VERSION.txt +++ b/pkgs/sagemath-repl/VERSION.txt @@ -1 +1 @@ -10.4.rc3 +10.4.rc4 diff --git a/pkgs/sagemath-sirocco/VERSION.txt b/pkgs/sagemath-sirocco/VERSION.txt index 7090b0bec63..674a81760a4 100644 --- a/pkgs/sagemath-sirocco/VERSION.txt +++ b/pkgs/sagemath-sirocco/VERSION.txt @@ -1 +1 @@ -10.4.rc3 +10.4.rc4 diff --git a/pkgs/sagemath-tdlib/VERSION.txt b/pkgs/sagemath-tdlib/VERSION.txt index 7090b0bec63..674a81760a4 100644 --- a/pkgs/sagemath-tdlib/VERSION.txt +++ b/pkgs/sagemath-tdlib/VERSION.txt @@ -1 +1 @@ -10.4.rc3 +10.4.rc4 diff --git a/src/VERSION.txt b/src/VERSION.txt index 7090b0bec63..674a81760a4 100644 --- a/src/VERSION.txt +++ b/src/VERSION.txt @@ -1 +1 @@ -10.4.rc3 +10.4.rc4 diff --git a/src/bin/sage-version.sh b/src/bin/sage-version.sh index 05b25462bec..6b0f8996ba7 100644 --- 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.4.rc3' -SAGE_RELEASE_DATE='2024-07-12' -SAGE_VERSION_BANNER='SageMath version 10.4.rc3, Release Date: 2024-07-12' +SAGE_VERSION='10.4.rc4' +SAGE_RELEASE_DATE='2024-07-16' +SAGE_VERSION_BANNER='SageMath version 10.4.rc4, Release Date: 2024-07-16' diff --git a/src/sage/doctest/parsing.py b/src/sage/doctest/parsing.py index be80932bed1..92dd31384b3 100644 --- a/src/sage/doctest/parsing.py +++ b/src/sage/doctest/parsing.py @@ -1677,6 +1677,12 @@ def do_fixup(self, want, got): got = ld_pie_warning_regex.sub('', got) did_fixup = True + if "R[write to console]" in got: + # Supress R warnings + r_warning_regex = re.compile(r'R\[write to console\]:.*') + got = r_warning_regex.sub('', got) + did_fixup = True + if "Overriding pythran description" in got: # Some signatures changed in numpy-1.25.x that may yet be # reverted, but which pythran would otherwise warn about. diff --git a/src/sage/version.py b/src/sage/version.py index fabda63c68e..5f4852ebd31 100644 --- 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.4.rc3' -date = '2024-07-12' -banner = 'SageMath version 10.4.rc3, Release Date: 2024-07-12' +version = '10.4.rc4' +date = '2024-07-16' +banner = 'SageMath version 10.4.rc4, Release Date: 2024-07-16'