sage --package: Multiple tarballs, binary wheels; build/pkgs/jsonschema: Update; clarabel: Change to binary wheel

.github/workflows/doc-build.yml

@@ -204,10 +204,9 @@ jobs:
                                                   -e 's;#L[0-9]*";";' \
              && git commit -a -m 'wipe-out')
             # Since HEAD is at commit 'wipe-out', HEAD~1 is commit 'new' (new doc), HEAD~2 is commit 'old' (old doc)
-            (cd doc && git diff $(git rev-parse HEAD~2) -- "*.html") > diff.txt
-            # Restore the new doc dropping changes by "wipe out"
-            (cd doc && git checkout -q -f HEAD~1)
-            .ci/create-changes-html.sh diff.txt doc
+            .ci/create-changes-html.sh $(cd doc && git rev-parse HEAD~2) doc
+            # Restore the new doc with changes made in create-changes-html.sh but dropping changes by "wipe out"
+            (cd doc && git stash -q && git checkout -q -f HEAD~1 && git stash pop -q || echo '(error ignored)')
             # Sometimes rm -rf .git errors out because of some diehard hidden files
             # So we simply move it out of the doc directory
             (cd doc && mv .git ../git && mv .gitattributes ../gitattributes)

build/bin/sage-spkg

@@ -349,7 +349,7 @@ esac
 ensure_pkg_src() { ###############################################
 case "$PKG_SRC_TYPE" in
     normal|wheel)
-        PKG_SRC=$(sage-package download $SAGE_DOWNLOAD_FILE_OPTIONS $PKG_BASE) || exit_with_error_msg "Error downloading tarball of $PKG_BASE"
+        PKG_SRC=$(sage-package download $SAGE_DOWNLOAD_FILE_OPTIONS -- $PKG_BASE) || exit_with_error_msg "Error downloading tarball of $PKG_BASE"
         # Do a final check that PKG_SRC is a file with an absolute path
         cd /
         if [ ! -f "$PKG_SRC" ]; then
@@ -804,6 +804,13 @@ if [ $ERASE_ONLY = 1 ]; then
     exit 0
 fi
 
+if [ -z "$SAGE_INSTALL_FETCH_ONLY" ]; then
+    TAGS=$("$SAGE_INST_LOCAL"/bin/python3 -c "from packaging.tags import sys_tags; print(' '.join(f'{tag.interpreter}-{tag.abi}-{tag.platform}' for tag in sys_tags()))" 2>/dev/null)
+    if [ -n "$TAGS" ]; then
+        SAGE_DOWNLOAD_FILE_OPTIONS+=" --tags $TAGS"
+    fi
+fi
+
 if [ $INSTALL = 1 ]; then
     warning_for_experimental_packages
     ensure_pkg_src

build/pkgs/clarabel/checksums.ini

@@ -0,0 +1,35 @@
+[clarabel-0.9.0-cp37-abi3-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl]
+tarball=clarabel-0.9.0-cp37-abi3-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl
+sha256=702cc4666c0ccf893c936f9f1f55cbb3233ae2d5fa05f67b370ac3e7ec50f222
+upstream_url=https://files.pythonhosted.org/packages/8b/b9/e41f5316a2d4261c340d9fa6aa1694dd57d12cc45f1e5dfc5773d2b53d39/clarabel-0.9.0-cp37-abi3-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl
+
+[clarabel-0.9.0-cp37-abi3-macosx_10_12_x86_64.whl]
+tarball=clarabel-0.9.0-cp37-abi3-macosx_10_12_x86_64.whl
+sha256=8ea616757b460153ead375b3dd3ce763d46fc3717248077bbfa7b2c844b1775f
+upstream_url=https://files.pythonhosted.org/packages/65/75/b4f2b5f4a0af6975c463efe9ef580debff98ade6795e6e885babf7527586/clarabel-0.9.0-cp37-abi3-macosx_10_12_x86_64.whl
+
+[clarabel-0.9.0-cp37-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl]
+tarball=clarabel-0.9.0-cp37-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl
+sha256=2b5ae16d7dd87aabf72260cf9590ba0d037c52d48555bcf3a86b1f0d9cf88dd4
+upstream_url=https://files.pythonhosted.org/packages/a5/2e/096e0bc32ffa7eadb69f6e768fbbc58acf0b0e4003db4bd70c79b1856c47/clarabel-0.9.0-cp37-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl
+
+[clarabel-0.9.0-cp37-abi3-manylinux_2_17_i686.manylinux2014_i686.whl]
+tarball=clarabel-0.9.0-cp37-abi3-manylinux_2_17_i686.manylinux2014_i686.whl
+sha256=85cb560a5c4cdfb079e3437e21f0b62b69ba766ae082aeb96ced0b5763214077
+upstream_url=https://files.pythonhosted.org/packages/d9/1a/4319fa902c9c3e350d134d78d79baa61c6e2e5e51050861ecc147c73f6a7/clarabel-0.9.0-cp37-abi3-manylinux_2_17_i686.manylinux2014_i686.whl
+
+[clarabel-0.9.0-cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl]
+tarball=clarabel-0.9.0-cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
+sha256=0eaeb3fbb5a90b598700d5435c7f102592a1a79ee25df5a097e0af575838786b
+upstream_url=https://files.pythonhosted.org/packages/8c/12/e92ba69884f84e0f16a9fb5093522924502995348f0269cc42ed062f2edc/clarabel-0.9.0-cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
+
+[clarabel-0.9.0-cp37-abi3-win32.whl]
+tarball=clarabel-0.9.0-cp37-abi3-win32.whl
+sha256=759c2fa0ccc61ae1a02691c43753638a0ae793bf1de81c6f6763c346789a7e25
+upstream_url=https://files.pythonhosted.org/packages/2e/1f/ce55955a7ad5946cacd1f0aa76233ee354d4c357669ce81f1e5dc69be971/clarabel-0.9.0-cp37-abi3-win32.whl
+
+[clarabel-0.9.0-cp37-abi3-win_amd64.whl]
+tarball=clarabel-0.9.0-cp37-abi3-win_amd64.whl
+sha256=d24e4ed1b686eb2fe2a1b6e77935af6ad62a2c044131e70801ec1d3ef3d33280
+upstream_url=https://files.pythonhosted.org/packages/36/be/110fe7ca190e024e3185d6351645346b785da6933ce3fb382d4811215f8c/clarabel-0.9.0-cp37-abi3-win_amd64.whl
+

build/pkgs/clarabel/dependencies

@@ -1,4 +1,4 @@
- | $(PYTHON_TOOLCHAIN) $(PYTHON)
+numpy scipy | pip $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.

build/pkgs/clarabel/package-version.txt

@@ -0,0 +1 @@
+0.9.0

build/pkgs/jsonschema/SPKG.rst

@@ -1,19 +1,18 @@
-jsonschema: Python implementation of JSON Schema
-================================================
+jsonschema: Implementation of JSON Schema validation for Python
+===============================================================
 
 Description
 -----------
 
-jsonschema is an implementation of JSON Schema for Python
+Implementation of JSON Schema validation for Python
 
 License
 -------
 
-MIT License
-
+MIT
 
 Upstream Contact
 ----------------
 
-Home page: http://github.com/Julian/jsonschema
+https://pypi.org/project/jsonschema/
 

build/pkgs/jsonschema/checksums.ini

@@ -1,4 +1,5 @@
-tarball=jsonschema-VERSION-py3-none-any.whl
-sha1=189537b18c91e60be991a3dba704577d19f8e48d
-sha256=a870ad254da1a8ca84b6a2905cac29d265f805acc57af304784962a2aa6508f6
-upstream_url=https://pypi.io/packages/py3/j/jsonschema/jsonschema-VERSION-py3-none-any.whl
+[jsonschema-4.22.0-py3-none-any.whl]
+tarball=jsonschema-4.22.0-py3-none-any.whl
+sha256=ff4cfd6b1367a40e7bc6411caec72effadd3db0bbe5017de188f2d6108335802
+upstream_url=https://files.pythonhosted.org/packages/c8/2f/324fab4be6fe37fb7b521546e8a557e6cf08c1c1b3d0b4839a00f589d9ef/jsonschema-4.22.0-py3-none-any.whl
+

build/pkgs/jsonschema/dependencies

@@ -1,4 +1,4 @@
-jsonschema_specifications pyrsistent attrs fqdn isoduration jsonpointer uri_template webcolors | $(PYTHON_TOOLCHAIN) $(PYTHON)
+attrs jsonschema_specifications referencing rpds_py | pip $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.

build/pkgs/jsonschema/package-version.txt

@@ -1 +1 @@
-4.17.3
+4.22.0

build/pkgs/jsonschema/version_requirements.txt

@@ -1 +1 @@
-jsonschema >=3.2.0
+jsonschema

build/pkgs/jsonschema_specifications/checksums.ini

@@ -1,4 +1,4 @@
 tarball=jsonschema_specifications-VERSION-py3-none-any.whl
-sha1=4132bed31478bc96960099e58ae4c083c514c551
-sha256=764a2b9325c225208121948b15f2b2d16fddbe223fdfc096b45c70c1f7f7b8c1
+sha1=2000de39fb573689f2119aa8ad9d1108cd1db217
+sha256=87e4fdf3a94858b8a2ba2778d9ba57d8a9cafca7c7489c46ba0d30a8bc6a9c3c
 upstream_url=https://pypi.io/packages/py3/j/jsonschema_specifications/jsonschema_specifications-VERSION-py3-none-any.whl

build/pkgs/jsonschema_specifications/package-version.txt

@@ -1 +1 @@
-2023.3.3
+2023.12.1

build/pkgs/referencing/checksums.ini

@@ -1,4 +1,4 @@
 tarball=referencing-VERSION-py3-none-any.whl
-sha1=9d710ba3a604d24ffded218a3813b5fd1fe2e495
-sha256=160f24a7d2411dc82b1efd96dfb083ee9e5cc9bc8e492d323e0dd853989d37b3
+sha1=99eff1ea1adcc39e04dbed8487bc01974766646e
+sha256=eda6d3234d62814d1c64e305c1331c9a3a6132da475ab6382eaa997b21ee75de
 upstream_url=https://pypi.io/packages/py3/r/referencing/referencing-VERSION-py3-none-any.whl

build/pkgs/referencing/dependencies

@@ -1,4 +1,4 @@
-attrs pyrsistent | $(PYTHON_TOOLCHAIN) $(PYTHON)
+attrs rpds_py | pip $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.

build/pkgs/referencing/package-version.txt

@@ -1 +1 @@
-0.23.0
+0.35.1

build/pkgs/rpds_py/SPKG.rst

@@ -0,0 +1,21 @@
+rpds_py: Python bindings to Rust's persistent data structures (rpds)
+====================================================================
+
+Description
+-----------
+
+Python bindings to Rust's persistent data structures (rpds)
+
+In SageMath, this package is used as a dependency package of the
+Jupyter notebook / JupyterLab.
+
+License
+-------
+
+MIT
+
+Upstream Contact
+----------------
+
+https://pypi.org/project/rpds-py/
+