sagemath · vbraun · Dec 26, 2023 · Dec 14, 2023 · Dec 14, 2023 · Dec 14, 2023
diff --git a/build/bin/sage-dist-helpers b/build/bin/sage-dist-helpers
@@ -244,7 +244,7 @@ sdh_pip_install() {
                 # Our default after #33789 (Sage 9.7): We allow the package to provision
                 # its build environment using the stored wheels.
                 # We pass --find-links.
-                # The SPKG needs to declare "setuptools_wheel" as a dependency.
+                # The SPKG needs to declare "setuptools" as a dependency.
                 build_isolation_option="--find-links=$SAGE_SPKG_WHEELS"
                 ;;
             --no-build-isolation)

diff --git a/build/bin/sage-spkg b/build/bin/sage-spkg
@@ -509,7 +509,9 @@ else
         # just copy to dist/ and create a simple install script.
         mkdir -p dist
         cp "$PKG_SRC" dist/
-        echo "sdh_store_and_pip_install_wheel ." > spkg-install.in
+        if [ ! -f spkg-install.in ]; then
+            echo "sdh_store_and_pip_install_wheel ." > spkg-install.in
+        fi
         ;;
     *)
         # Source tarball

diff --git a/build/make/Makefile.in b/build/make/Makefile.in
@@ -324,7 +324,7 @@ all-toolchain: base-toolchain
 
 # Shorthand for a list of packages sufficient for building and installing
 # typical Python packages from source. Wheel packages only need pip.
-PYTHON_TOOLCHAIN = setuptools pip setuptools_scm wheel setuptools_wheel
+PYTHON_TOOLCHAIN = setuptools pip setuptools_scm wheel flit_core hatchling
 
 # Trac #32056: Avoid installed setuptools leaking into the build of python3 by uninstalling it.
 # It will have to be reinstalled anyway because of its dependency on $(PYTHON).

diff --git a/build/pkgs/calver/dependencies b/build/pkgs/calver/dependencies
@@ -1,4 +1,4 @@
- | $(PYTHON_TOOLCHAIN) $(PYTHON)
+ | pip $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/deprecation/SPKG.rst b/build/pkgs/deprecation/SPKG.rst
diff --git a/build/pkgs/deprecation/checksums.ini b/build/pkgs/deprecation/checksums.ini
diff --git a/build/pkgs/deprecation/dependencies b/build/pkgs/deprecation/dependencies
diff --git a/build/pkgs/deprecation/distros/conda.txt b/build/pkgs/deprecation/distros/conda.txt
diff --git a/build/pkgs/deprecation/install-requires.txt b/build/pkgs/deprecation/install-requires.txt
diff --git a/build/pkgs/deprecation/package-version.txt b/build/pkgs/deprecation/package-version.txt
diff --git a/build/pkgs/deprecation/spkg-install.in b/build/pkgs/deprecation/spkg-install.in
diff --git a/build/pkgs/deprecation/type b/build/pkgs/deprecation/type
diff --git a/build/pkgs/distlib/SPKG.rst b/build/pkgs/distlib/SPKG.rst
@@ -9,7 +9,7 @@ Distribution utilities
 License
 -------
 
-Python license
+PSF-2.0
 
 Upstream Contact
 ----------------

diff --git a/build/pkgs/distlib/checksums.ini b/build/pkgs/distlib/checksums.ini
@@ -1,5 +1,5 @@
-tarball=distlib-VERSION.tar.gz
-sha1=5c99f8bd1cc58c387a8d22afa632f81c6fec9993
-md5=44e4357e35bbd77fdf1b81e174e34f20
-cksum=3690000669
-upstream_url=https://pypi.io/packages/source/d/distlib/distlib-VERSION.tar.gz
+tarball=distlib-VERSION-py2.py3-none-any.whl
+sha1=97ea3bb71040f0348eaea272ec17fefea5806e87
+md5=cf336842ba81996e554ae4eb2cd76d5d
+cksum=3779817199
+upstream_url=https://pypi.io/packages/py2.py3/d/distlib/distlib-VERSION-py2.py3-none-any.whl
diff --git a/build/pkgs/distlib/dependencies b/build/pkgs/distlib/dependencies
@@ -1,4 +1,4 @@
- | $(PYTHON_TOOLCHAIN) $(PYTHON)
+ | pip $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/distlib/package-version.txt b/build/pkgs/distlib/package-version.txt
@@ -1 +1 @@
-0.3.7
+0.3.8
diff --git a/build/pkgs/distlib/spkg-install.in b/build/pkgs/distlib/spkg-install.in
diff --git a/build/pkgs/editables/dependencies b/build/pkgs/editables/dependencies
@@ -1,4 +1,4 @@
- | $(PYTHON_TOOLCHAIN) $(PYTHON)
+ | flit_core $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/filelock/checksums.ini b/build/pkgs/filelock/checksums.ini
@@ -1,5 +1,5 @@
 tarball=filelock-VERSION-py3-none-any.whl
-sha1=74f5368865bf05ddc5b69949e4547ad25c078fc1
-md5=63b0f117cb65ef531ffafb566170661e
-cksum=1046951951
+sha1=f1fa92751023660a10b248f8559d09f3c461403f
+md5=d0af0f1a2ee56c24f630ece278cb062f
+cksum=3749691502
 upstream_url=https://pypi.io/packages/py3/f/filelock/filelock-VERSION-py3-none-any.whl
diff --git a/build/pkgs/filelock/dependencies b/build/pkgs/filelock/dependencies
@@ -1,4 +1,4 @@
- | $(PYTHON_TOOLCHAIN) $(PYTHON)
+ | pip $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/filelock/package-version.txt b/build/pkgs/filelock/package-version.txt
@@ -1 +1 @@
-3.12.3
+3.13.1
diff --git a/build/pkgs/hatch_fancy_pypi_readme/checksums.ini b/build/pkgs/hatch_fancy_pypi_readme/checksums.ini
@@ -1,5 +1,5 @@
-tarball=hatch_fancy_pypi_readme-VERSION.tar.gz
-sha1=8c8568bb86bdc65133e9d8b27493a464fa3320da
-md5=8755cce1a4a4d5e5d84992089801acbf
-cksum=2176903739
-upstream_url=https://pypi.io/packages/source/h/hatch_fancy_pypi_readme/hatch_fancy_pypi_readme-VERSION.tar.gz
+tarball=hatch_fancy_pypi_readme-VERSION-py3-none-any.whl
+sha1=4076ea14577b3c711a8345498d8f91b1c8a13d09
+md5=d7acd13333f6c71dcbfa62420c7f257b
+cksum=1527082323
+upstream_url=https://pypi.io/packages/py3/h/hatch_fancy_pypi_readme/hatch_fancy_pypi_readme-VERSION-py3-none-any.whl
diff --git a/build/pkgs/hatch_fancy_pypi_readme/dependencies b/build/pkgs/hatch_fancy_pypi_readme/dependencies
@@ -1,4 +1,4 @@
- | $(PYTHON_TOOLCHAIN) hatchling $(PYTHON)
+hatchling | pip $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/hatch_fancy_pypi_readme/spkg-install.in b/build/pkgs/hatch_fancy_pypi_readme/spkg-install.in
diff --git a/build/pkgs/hatch_vcs/SPKG.rst b/build/pkgs/hatch_vcs/SPKG.rst
@@ -9,6 +9,8 @@ Hatch plugin for versioning with your preferred VCS
 License
 -------
 
+MIT
+
 Upstream Contact
 ----------------
 

diff --git a/build/pkgs/hatch_vcs/checksums.ini b/build/pkgs/hatch_vcs/checksums.ini
@@ -1,5 +1,5 @@
-tarball=hatch_vcs-VERSION.tar.gz
-sha1=026b964066b38fd7e823900817fb9ea7af3f8d9b
-md5=c2f2cbe6851b7b2969cb4aa24c4b9b2f
-cksum=588874896
-upstream_url=https://pypi.io/packages/source/h/hatch_vcs/hatch_vcs-VERSION.tar.gz
+tarball=hatch_vcs-VERSION-py3-none-any.whl
+sha1=a4da813bf9a745ed2020bf462f4bc19a1ab7fc11
+md5=82bee9889b95170e550c98f8dd11bc61
+cksum=1575327634
+upstream_url=https://pypi.io/packages/py3/h/hatch_vcs/hatch_vcs-VERSION-py3-none-any.whl
diff --git a/build/pkgs/hatch_vcs/dependencies b/build/pkgs/hatch_vcs/dependencies
@@ -1,4 +1,4 @@
- | $(PYTHON_TOOLCHAIN) hatchling $(PYTHON)
+hatchling | pip $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/hatch_vcs/package-version.txt b/build/pkgs/hatch_vcs/package-version.txt
@@ -1 +1 @@
-0.3.0
+0.4.0
diff --git a/build/pkgs/hatch_vcs/spkg-install.in b/build/pkgs/hatch_vcs/spkg-install.in
diff --git a/build/pkgs/hatchling/checksums.ini b/build/pkgs/hatchling/checksums.ini
@@ -1,5 +1,5 @@
-tarball=hatchling-VERSION.tar.gz
-sha1=f3db8639e9bee89e2e2420d1bc7a048a910622c9
-md5=43f7203cacb6c3c178b93149b8a8151d
-cksum=235277633
-upstream_url=https://pypi.io/packages/source/h/hatchling/hatchling-VERSION.tar.gz
+tarball=hatchling-VERSION-py3-none-any.whl
+sha1=aa9d69b9dd820716440252d737a4aeaf9b4e541f
+md5=20e5ea4deea21f91759fb2269b71f0dd
+cksum=446304413
+upstream_url=https://pypi.io/packages/py3/h/hatchling/hatchling-VERSION-py3-none-any.whl
diff --git a/build/pkgs/hatchling/dependencies b/build/pkgs/hatchling/dependencies
@@ -1,4 +1,4 @@
- pathspec tomli editables pluggy packaging trove_classifiers | $(PYTHON_TOOLCHAIN) $(PYTHON)
+ pathspec tomli editables pluggy packaging trove_classifiers | pip $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/hatchling/package-version.txt b/build/pkgs/hatchling/package-version.txt
@@ -1 +1 @@
-1.18.0
+1.20.0
diff --git a/build/pkgs/hatchling/spkg-install.in b/build/pkgs/hatchling/spkg-install.in
diff --git a/build/pkgs/importlib_metadata/checksums.ini b/build/pkgs/importlib_metadata/checksums.ini
@@ -1,5 +1,5 @@
-tarball=importlib_metadata-VERSION.tar.gz
-sha1=0e5742cd1d559863573bfb4f6cb7ca9ad8dcf466
-md5=c04c814eee1abf42790cfa4bd0454af1
-cksum=1038169537
-upstream_url=https://pypi.io/packages/source/i/importlib_metadata/importlib_metadata-VERSION.tar.gz
+tarball=importlib_metadata-VERSION-py3-none-any.whl
+sha1=0e693ba704ac628065bab72a097dad3311213f4b
+md5=67eac786f2f9e8bf5879e88ef527250a
+cksum=1288292429
+upstream_url=https://pypi.io/packages/py3/i/importlib_metadata/importlib_metadata-VERSION-py3-none-any.whl
diff --git a/build/pkgs/importlib_metadata/package-version.txt b/build/pkgs/importlib_metadata/package-version.txt
@@ -1 +1 @@
-6.8.0
+7.0.0
diff --git a/build/pkgs/importlib_metadata/spkg-install.in b/build/pkgs/importlib_metadata/spkg-install.in
diff --git a/build/pkgs/importlib_resources/checksums.ini b/build/pkgs/importlib_resources/checksums.ini
@@ -1,5 +1,5 @@
-tarball=importlib_resources-VERSION.tar.gz
-sha1=4af82ed75a1672a45157bfa7d09c4dfd0605802a
-md5=525d238db212bdec2df06c0d4b479e73
-cksum=1494471486
-upstream_url=https://pypi.io/packages/source/i/importlib_resources/importlib_resources-VERSION.tar.gz
+tarball=importlib_resources-VERSION-py3-none-any.whl
+sha1=5caa4e8a9ee93123a5c3badb6edbc009b5d8494a
+md5=a4ba26d808eed58bde249276da04c9e1
+cksum=2487282894
+upstream_url=https://pypi.io/packages/py3/i/importlib_resources/importlib_resources-VERSION-py3-none-any.whl
diff --git a/build/pkgs/importlib_resources/dependencies b/build/pkgs/importlib_resources/dependencies
@@ -1,4 +1,4 @@
- zipp | $(PYTHON_TOOLCHAIN) $(PYTHON)
+zipp | pip $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/importlib_resources/package-version.txt b/build/pkgs/importlib_resources/package-version.txt
@@ -1 +1 @@
-6.1.0
+6.1.1
diff --git a/build/pkgs/importlib_resources/spkg-install.in b/build/pkgs/importlib_resources/spkg-install.in
diff --git a/build/pkgs/nbconvert/spkg-install.in b/build/pkgs/nbconvert/spkg-install.in
diff --git a/build/pkgs/pathspec/checksums.ini b/build/pkgs/pathspec/checksums.ini
@@ -1,5 +1,5 @@
-tarball=pathspec-VERSION.tar.gz
-sha1=418ae4112af18af995c0f20a22e5a903b8ce50ae
-md5=28c87c3581b10152c4581d10fe33f765
-cksum=2161527634
-upstream_url=https://pypi.io/packages/source/p/pathspec/pathspec-VERSION.tar.gz
+tarball=pathspec-VERSION-py3-none-any.whl
+sha1=e31b7b2b1a59ab192eb2e92ac283211a11039769
+md5=53caa061bbda861c5b4766f41b084ec8
+cksum=1745881358
+upstream_url=https://pypi.io/packages/py3/p/pathspec/pathspec-VERSION-py3-none-any.whl
diff --git a/build/pkgs/pathspec/dependencies b/build/pkgs/pathspec/dependencies
@@ -1,4 +1,4 @@
- | $(PYTHON_TOOLCHAIN) $(PYTHON)
+ | pip $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/pathspec/package-version.txt b/build/pkgs/pathspec/package-version.txt
@@ -1 +1 @@
-0.10.2
+0.12.1
diff --git a/build/pkgs/pathspec/spkg-install.in b/build/pkgs/pathspec/spkg-install.in
diff --git a/build/pkgs/pip/checksums.ini b/build/pkgs/pip/checksums.ini
@@ -1,5 +1,5 @@
-tarball=pip-VERSION.tar.gz
-sha1=d1400a4eb662e4741ac68957f47bc97d600743f8
-md5=f0c9fba61e9d9badcc9921062e993d84
-cksum=309527365
-upstream_url=https://pypi.io/packages/source/p/pip/pip-VERSION.tar.gz
+tarball=pip-VERSION-py3-none-any.whl
+sha1=4b2baddc0673f73017e531648a9ee27e47925e7a
+md5=5d2d058044a3ae2800d18e358ddc72ca
+cksum=1470281176
+upstream_url=https://pypi.io/packages/py3/p/pip/pip-VERSION-py3-none-any.whl
diff --git a/build/pkgs/pip/dependencies b/build/pkgs/pip/dependencies
@@ -1,4 +1,4 @@
- setuptools wheel | $(PYTHON)
+ | $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/pip/spkg-install.in b/build/pkgs/pip/spkg-install.in
@@ -1,11 +1,6 @@
-cd src
+# pip can install its own wheel! But first we need to ensure that the
+# wheel file is on the PYTHONPATH
+export PYTHONPATH=$(pwd)/$(cd dist && for w in *.whl; do cp $w ..; echo $w; break; done)
 
-sdh_setup_bdist_wheel
-
-# pip can install its own wheel! But first we need to ensure that the pip
-# source directory in on the PYTHONPATH
-export PYTHONPATH="$(pwd)/src"
-
-# --ignore-installed makes sure that pip does not mistake
-# its own source tree as an existing installation
-sdh_store_and_pip_install_wheel --ignore-installed .
+# This line is the same as what sage-spkg uses to install the wheel.
+sdh_store_and_pip_install_wheel .
diff --git a/build/pkgs/pip/spkg-pipinst.in b/build/pkgs/pip/spkg-pipinst.in
@@ -1,5 +1,3 @@
-cd src
-
 # pip can install its own wheel! But first we need to ensure that the pip
-# source directory in on the PYTHONPATH
-export PYTHONPATH="$(pwd)/src"
+# wheelfile is on the PYTHONPATH
+export PYTHONPATH=$(pwd)/$(echo *.whl)
diff --git a/build/pkgs/platformdirs/checksums.ini b/build/pkgs/platformdirs/checksums.ini
@@ -1,5 +1,5 @@
-tarball=platformdirs-VERSION.tar.gz
-sha1=82e215dc9c45eedf9168584fede36d795714f677
-md5=a6ba3a442347fac346982acb597c8bf8
-cksum=2465457023
-upstream_url=https://pypi.io/packages/source/p/platformdirs/platformdirs-VERSION.tar.gz
+tarball=platformdirs-VERSION-py3-none-any.whl
+sha1=cafa761738da959f2df0a8a92da4c72fd8eaf93e
+md5=487007776ff343efc509b68d08cd7fd7
+cksum=162426958
+upstream_url=https://pypi.io/packages/py3/p/platformdirs/platformdirs-VERSION-py3-none-any.whl
diff --git a/build/pkgs/platformdirs/dependencies b/build/pkgs/platformdirs/dependencies
@@ -1,4 +1,4 @@
- setuptools_scm | $(PYTHON_TOOLCHAIN) hatchling hatch_vcs $(PYTHON)
+ | pip $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/platformdirs/package-version.txt b/build/pkgs/platformdirs/package-version.txt
@@ -1 +1 @@
-3.11.0
+4.1.0
diff --git a/build/pkgs/platformdirs/spkg-install.in b/build/pkgs/platformdirs/spkg-install.in
diff --git a/build/pkgs/pluggy/dependencies b/build/pkgs/pluggy/dependencies
@@ -1,4 +1,4 @@
- | $(PYTHON_TOOLCHAIN) $(PYTHON)
+ | pip $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/referencing/dependencies b/build/pkgs/referencing/dependencies
@@ -1,4 +1,4 @@
-attrs | $(PYTHON_TOOLCHAIN) $(PYTHON)
+attrs pyrsistent | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/setuptools/checksums.ini b/build/pkgs/setuptools/checksums.ini
@@ -1,5 +1,5 @@
-tarball=setuptools-VERSION.tar.gz
-sha1=b0c9b16863c57d70adc22651906eea7eaee09803
-md5=d967ca2ba7f46db887daee2d5c9bd6a2
-cksum=2346145273
-upstream_url=https://pypi.io/packages/source/s/setuptools/setuptools-VERSION.tar.gz
+tarball=setuptools-VERSION-py3-none-any.whl
+sha1=4227225bb193e3a45542f45966caf777d4c913e8
+md5=f096ed836f4036a11aa277fa16dc09ff
+cksum=263664173
+upstream_url=https://pypi.io/packages/py3/s/setuptools/setuptools-VERSION-py3-none-any.whl
diff --git a/build/pkgs/setuptools/dependencies b/build/pkgs/setuptools/dependencies
@@ -1,4 +1,4 @@
- | $(PYTHON)
+ | pip $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/setuptools/package-version.txt b/build/pkgs/setuptools/package-version.txt
@@ -1 +1 @@
-68.2.2
+69.0.2
diff --git a/build/pkgs/setuptools/spkg-install.in b/build/pkgs/setuptools/spkg-install.in
diff --git a/build/pkgs/setuptools_wheel/SPKG.rst b/build/pkgs/setuptools_wheel/SPKG.rst
diff --git a/build/pkgs/setuptools_wheel/checksums.ini b/build/pkgs/setuptools_wheel/checksums.ini
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,7 @@ Distribution utilities @@
     License
     -------
-    Python license
+    PSF-2.0
     Upstream Contact
     ----------------
@@ Expand Down @@