Merge branch 'develop' into rel_cython_headers

.github/workflows/ci-linux-incremental.yml

@@ -60,8 +60,8 @@ jobs:
       - name: Determine targets to build
         id: build-targets
         run: |
-          echo "uninstall_targets=$(echo $(for a in '' ${{ steps.changed-packages.outputs.configures_all_changed_files }}; do echo $a | sed -E 's,build/pkgs/([_.a-z0-9]*)/spkg-configure[.]m4 *,\1-uninstall,'; done | sort -u))" >> $GITHUB_OUTPUT
-          echo "build_targets=$(echo $(for a in '' ${{ steps.changed-packages.outputs.pkgs_all_changed_files }}; do echo $a | sed -E 's,-,_,g;s,(build/)?pkgs/([-_.a-z0-9]*)/[^ ]* *,\2-ensure,;'; done | sort -u))" >> $GITHUB_OUTPUT
+          echo "uninstall_targets=$(echo $(for a in '' ${{ steps.changed-packages.outputs.configures_all_changed_files }}; do echo $a | sed -E 's,build/pkgs/([a-z0-9][_.a-z0-9]*)/spkg-configure[.]m4 *,\1-uninstall,'; done | sort -u))" >> $GITHUB_OUTPUT
+          echo "build_targets=$(echo $(for a in '' ${{ steps.changed-packages.outputs.pkgs_all_changed_files }}; do SPKG=$(echo $a | sed -E 's,-,_,g;s,(build/)?pkgs/([a-z0-9][-_.a-z0-9]*)/[^ ]* *,\2,;'); if [ -f "build/pkgs/$SPKG/checksums.ini" -o -f "build/pkgs/$SPKG/requirements.txt" -o -f "build/pkgs/$SPKG/spkg-install" ]; then echo "$SPKG-ensure"; fi; done | sort -u))" >> $GITHUB_OUTPUT
           cat $GITHUB_OUTPUT
 
   test:

.upstream.d/20-github.com-sagemath-sage-releases

@@ -1,4 +1,5 @@
 # Upstream packages as uploaded as GitHub release assets.
 # This file is automatically updated by the sage-update-version script.
+https://github.com/sagemath/sage/releases/download/10.3/
 https://github.com/sagemath/sage/releases/download/10.2/
 https://github.com/sagemath/sage/releases/download/10.1/

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.2.rc4
+version: 10.3.beta0
 doi: 10.5281/zenodo.593563
-date-released: 2023-11-17
+date-released: 2023-12-05
 repository-code: "https://github.com/sagemath/sage"
 url: "https://www.sagemath.org/"

VERSION.txt

@@ -1 +1 @@
-SageMath version 10.2.rc4, Release Date: 2023-11-17
+SageMath version 10.3.beta0, Release Date: 2023-12-05

build/bin/sage-build-env-config.in

@@ -58,6 +58,8 @@ export SAGE_SUITESPARSE_PREFIX="@SAGE_SUITESPARSE_PREFIX@"
 
 export SAGE_CONFIGURE_FFLAS_FFPACK="@SAGE_CONFIGURE_FFLAS_FFPACK@"
 
+export SAGE_HAVE_LIBJPEG="@SAGE_HAVE_LIBJPEG@"
+
 export CONFIGURED_SAGE_EDITABLE="@SAGE_EDITABLE@"
 export CONFIGURED_SAGE_WHEELS="@SAGE_WHEELS@"
 

build/pkgs/_recommended/dependencies

@@ -1 +1 @@
-pandoc ffmpeg imagemagick texlive git
+pandoc ffmpeg imagemagick texlive git libjpeg

build/pkgs/anyio/SPKG.rst

@@ -0,0 +1,18 @@
+anyio: High level compatibility layer for multiple asynchronous event loop implementations
+==========================================================================================
+
+Description
+-----------
+
+High level compatibility layer for multiple asynchronous event loop implementations
+
+License
+-------
+
+MIT
+
+Upstream Contact
+----------------
+
+https://pypi.org/project/anyio/
+

build/pkgs/anyio/checksums.ini

@@ -0,0 +1,5 @@
+tarball=anyio-VERSION-py3-none-any.whl
+sha1=bb08368bb19e1aff2f4190e39300e43fee52103e
+md5=420d85e19168705cdf0223621b18831a
+cksum=627181302
+upstream_url=https://pypi.io/packages/py3/a/anyio/anyio-VERSION-py3-none-any.whl

build/pkgs/hatch_nodejs_version/dependencies → build/pkgs/anyio/dependencies

@@ -1,4 +1,4 @@
- hatchling | $(PYTHON_TOOLCHAIN) $(PYTHON)
+idna sniffio | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.

build/pkgs/anyio/install-requires.txt

@@ -0,0 +1 @@
+anyio

build/pkgs/anyio/package-version.txt

@@ -0,0 +1 @@
+4.0.0

build/pkgs/arrow/SPKG.rst

@@ -0,0 +1,18 @@
+arrow: Better dates & times for Python
+======================================
+
+Description
+-----------
+
+Better dates & times for Python
+
+License
+-------
+
+Apache 2.0
+
+Upstream Contact
+----------------
+
+https://pypi.org/project/arrow/
+

build/pkgs/arrow/checksums.ini

@@ -0,0 +1,5 @@
+tarball=arrow-VERSION-py3-none-any.whl
+sha1=fd9376ef4788dc2b1c981e6b5beb9048e046c556
+md5=71d18bb3d882ae242b5b1a397313bb12
+cksum=244356435
+upstream_url=https://pypi.io/packages/py3/a/arrow/arrow-VERSION-py3-none-any.whl

build/pkgs/arrow/dependencies

@@ -0,0 +1,4 @@
+dateutil types_python_dateutil | $(PYTHON_TOOLCHAIN)  $(PYTHON)
+
+----------
+All lines of this file are ignored except the first.

build/pkgs/arrow/install-requires.txt

@@ -0,0 +1 @@
+arrow

build/pkgs/arrow/package-version.txt

@@ -0,0 +1 @@
+1.3.0

build/pkgs/asttokens/checksums.ini

@@ -1,5 +1,5 @@
 tarball=asttokens-VERSION.tar.gz
-sha1=cca6058c6c23195148be93bfa32c0a0ca9b2f873
-md5=67b269e359fcb404cd8626985f3676ae
-cksum=3749309047
+sha1=d522a139240293953c99d32ca62c41542babb963
+md5=c353679585a40f43c24ca60fca33bbf6
+cksum=1117135252
 upstream_url=https://pypi.io/packages/source/a/asttokens/asttokens-VERSION.tar.gz

build/pkgs/asttokens/package-version.txt

@@ -1 +1 @@
-2.1.0
+2.4.1

build/pkgs/async_lru/SPKG.rst

@@ -0,0 +1,18 @@
+async_lru: Simple LRU cache for asyncio
+=======================================
+
+Description
+-----------
+
+Simple LRU cache for asyncio
+
+License
+-------
+
+MIT License
+
+Upstream Contact
+----------------
+
+https://pypi.org/project/async-lru/
+

build/pkgs/async_lru/checksums.ini

@@ -0,0 +1,5 @@
+tarball=async_lru-VERSION-py3-none-any.whl
+sha1=99b2ea5d551cbad28e08e45f0d0b00827f9ff73d
+md5=de1e9e7559810690de8b7084b372d9a2
+cksum=3326301475
+upstream_url=https://pypi.io/packages/py3/a/async_lru/async_lru-VERSION-py3-none-any.whl

build/pkgs/async_lru/install-requires.txt

@@ -0,0 +1 @@
+async-lru

build/pkgs/async_lru/package-version.txt

@@ -0,0 +1 @@
+2.0.4

build/pkgs/beautifulsoup4/checksums.ini

@@ -1,5 +1,5 @@
 tarball=beautifulsoup4-VERSION.tar.gz
-sha1=fbb73ba4221122b56cd4eac2d9e5d3ad2e383ae0
-md5=22f22f89cf9da41b22e1ece9639c66a3
-cksum=2807377018
+sha1=d9cd72f81e7710692b8ff0a42e69bf93375b5fd3
+md5=b49a6696a762e946c2be97c36a5adaa8
+cksum=839566236
 upstream_url=https://pypi.io/packages/source/b/beautifulsoup4/beautifulsoup4-VERSION.tar.gz

build/pkgs/beautifulsoup4/package-version.txt

@@ -1 +1 @@
-4.11.1
+4.12.2

build/pkgs/bleach/checksums.ini

@@ -1,5 +1,5 @@
-tarball=bleach-VERSION.tar.gz
-sha1=73c6b8fad993b318859ca65c365ac2191edd35fc
-md5=03b5faa43c0d771a86a2c4cb2575d070
-cksum=4204308806
-upstream_url=https://pypi.io/packages/source/b/bleach/bleach-VERSION.tar.gz
+tarball=bleach-VERSION-py3-none-any.whl
+sha1=7ba81a446171fb840d3083afadd0c87f0b599305
+md5=ec9e860103ffbc3e6e9963485464bfbc
+cksum=1174632300
+upstream_url=https://pypi.io/packages/py3/b/bleach/bleach-VERSION-py3-none-any.whl

build/pkgs/bleach/dependencies

@@ -1,4 +1,4 @@
- packaging six webencodings | $(PYTHON_TOOLCHAIN) $(PYTHON)
+ six webencodings | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.

build/pkgs/bleach/install-requires.txt

@@ -1 +1 @@
-bleach >=3.1.5
+bleach >= 5

build/pkgs/bleach/package-version.txt

@@ -1 +1 @@
-5.0.1
+6.1.0

build/pkgs/bliss/SPKG.rst

@@ -23,8 +23,3 @@ https://users.aalto.fi/~tjunttil/bliss/index.html
 Bliss used to be maintained by Tommi Junttila and Petteri Kaski up to version 0.73 at
 
 http://www.tcs.tkk.fi/Software/bliss/index.html
-
-Dependencies
-------------
-
-None

build/pkgs/bliss/distros/alpine.txt

@@ -0,0 +1 @@
+bliss

build/pkgs/bliss/distros/fedora.txt

@@ -0,0 +1,2 @@
+bliss
+bliss-devel

build/pkgs/bliss/spkg-configure.m4

@@ -0,0 +1,27 @@
+SAGE_SPKG_CONFIGURE([bliss], [
+    m4_pushdef([SAGE_BLISS_MINVER],[0.77])
+    m4_pushdef([SAGE_BLISS_MAJOR],[0])
+    m4_pushdef([SAGE_BLISS_MINOR],[77])
+    AC_CHECK_HEADER([bliss/bliss_C.h], [
+           AC_SEARCH_LIBS([bliss_new], [bliss], [
+             AC_MSG_CHECKING([checking bliss version directly])
+             AC_RUN_IFELSE([AC_LANG_PROGRAM([
+                      [#include <bliss/defs.hh>
+                      ]],[[
+                       if (BLISS_VERSION_MAJOR > ]] SAGE_BLISS_MAJOR [[ ) return 0;
+                       if (BLISS_VERSION_MAJOR == ]] SAGE_BLISS_MAJOR [[  &&
+                           BLISS_VERSION_MINOR >= ]] SAGE_BLISS_MINOR [[ ) return 0;
+                       else return 1;
+                      ]])],
+                     [AC_MSG_RESULT([Good.])],
+                     [AC_MSG_RESULT([Too old.])
+                      sage_spkg_install_bliss=yes],
+                     []) dnl cross-compilation - noop
+           ],
+              [sage_spkg_install_bliss=yes])
+    ], [sage_spkg_install_bliss=yes])
+    m4_popdef([SAGE_BLISS_MINVER])
+    m4_popdef([SAGE_BLISS_MAJOR])
+    m4_popdef([SAGE_BLISS_MINOR])
+])
+