diff --git a/build/bin/sage-dist-helpers b/build/bin/sage-dist-helpers
index 9def7350a37..ac588fc297c 100644
--- 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
index 70256370549..e2a151b4adc 100755
--- 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
index 0cbe86a90de..aac7a9164a2 100644
--- 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
index 47296a7bace..644ad35f773 100644
--- 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
deleted file mode 100644
index 8aa6712f42b..00000000000
--- a/build/pkgs/deprecation/SPKG.rst
+++ /dev/null
@@ -1,18 +0,0 @@
-deprecation: A library to handle automated deprecations
-=======================================================
-
-Description
------------
-
-A library to handle automated deprecations
-
-License
--------
-
-Apache 2
-
-Upstream Contact
-----------------
-
-https://pypi.org/project/deprecation/
-
diff --git a/build/pkgs/deprecation/checksums.ini b/build/pkgs/deprecation/checksums.ini
deleted file mode 100644
index b2e6c9d2964..00000000000
--- a/build/pkgs/deprecation/checksums.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-tarball=deprecation-VERSION.tar.gz
-sha1=34847e937ac203cfd0d8ea0a0f2579204cdb8fe4
-md5=6b79c6572fb241e3cecbbd7d539bb66b
-cksum=1034714094
-upstream_url=https://pypi.io/packages/source/d/deprecation/deprecation-VERSION.tar.gz
diff --git a/build/pkgs/deprecation/dependencies b/build/pkgs/deprecation/dependencies
deleted file mode 100644
index 47296a7bace..00000000000
--- a/build/pkgs/deprecation/dependencies
+++ /dev/null
@@ -1,4 +0,0 @@
- | $(PYTHON_TOOLCHAIN) $(PYTHON)
-
-----------
-All lines of this file are ignored except the first.
diff --git a/build/pkgs/deprecation/distros/conda.txt b/build/pkgs/deprecation/distros/conda.txt
deleted file mode 100644
index 4ba9b7530ed..00000000000
--- a/build/pkgs/deprecation/distros/conda.txt
+++ /dev/null
@@ -1 +0,0 @@
-deprecation
diff --git a/build/pkgs/deprecation/install-requires.txt b/build/pkgs/deprecation/install-requires.txt
deleted file mode 100644
index 4ba9b7530ed..00000000000
--- a/build/pkgs/deprecation/install-requires.txt
+++ /dev/null
@@ -1 +0,0 @@
-deprecation
diff --git a/build/pkgs/deprecation/package-version.txt b/build/pkgs/deprecation/package-version.txt
deleted file mode 100644
index 7ec1d6db408..00000000000
--- a/build/pkgs/deprecation/package-version.txt
+++ /dev/null
@@ -1 +0,0 @@
-2.1.0
diff --git a/build/pkgs/deprecation/spkg-install.in b/build/pkgs/deprecation/spkg-install.in
deleted file mode 100644
index 37ac1a53437..00000000000
--- a/build/pkgs/deprecation/spkg-install.in
+++ /dev/null
@@ -1,2 +0,0 @@
-cd src
-sdh_pip_install .
diff --git a/build/pkgs/deprecation/type b/build/pkgs/deprecation/type
deleted file mode 100644
index a6a7b9cd726..00000000000
--- a/build/pkgs/deprecation/type
+++ /dev/null
@@ -1 +0,0 @@
-standard
diff --git a/build/pkgs/distlib/SPKG.rst b/build/pkgs/distlib/SPKG.rst
index a4496c0427a..e59b0b7292c 100644
--- 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
index be255ceca11..b1a05ffc295 100644
--- 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
index 47296a7bace..644ad35f773 100644
--- 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
index 0f82685331e..66784322096 100644
--- 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
deleted file mode 100644
index 37ac1a53437..00000000000
--- a/build/pkgs/distlib/spkg-install.in
+++ /dev/null
@@ -1,2 +0,0 @@
-cd src
-sdh_pip_install .
diff --git a/build/pkgs/editables/dependencies b/build/pkgs/editables/dependencies
index 47296a7bace..e0e94942dba 100644
--- 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
index 0d412bb2ca3..6c597d2d7aa 100644
--- 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
index 47296a7bace..644ad35f773 100644
--- 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
index 871f80a34be..c10780c628a 100644
--- 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/furo/spkg-install.in b/build/pkgs/furo/spkg-install.in
deleted file mode 100644
index 37ac1a53437..00000000000
--- a/build/pkgs/furo/spkg-install.in
+++ /dev/null
@@ -1,2 +0,0 @@
-cd src
-sdh_pip_install .
diff --git a/build/pkgs/hatch_fancy_pypi_readme/checksums.ini b/build/pkgs/hatch_fancy_pypi_readme/checksums.ini
index 6d48eb14be8..6da100dad5a 100644
--- 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
index cfb7c484697..36380aee4e7 100644
--- 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
deleted file mode 100644
index 37ac1a53437..00000000000
--- a/build/pkgs/hatch_fancy_pypi_readme/spkg-install.in
+++ /dev/null
@@ -1,2 +0,0 @@
-cd src
-sdh_pip_install .
diff --git a/build/pkgs/hatch_vcs/SPKG.rst b/build/pkgs/hatch_vcs/SPKG.rst
index 51f4780749e..6c11d8d95fb 100644
--- 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
index 9c1290bda3b..e9908b1540e 100644
--- 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
index cfb7c484697..36380aee4e7 100644
--- 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
index 0d91a54c7d4..1d0ba9ea182 100644
--- 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
deleted file mode 100644
index 37ac1a53437..00000000000
--- a/build/pkgs/hatch_vcs/spkg-install.in
+++ /dev/null
@@ -1,2 +0,0 @@
-cd src
-sdh_pip_install .
diff --git a/build/pkgs/hatchling/checksums.ini b/build/pkgs/hatchling/checksums.ini
index d21781abeba..5d8b02696c5 100644
--- 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
index 479f1630979..b1769861625 100644
--- 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
index 84cc529467b..39893559155 100644
--- 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
deleted file mode 100644
index 37ac1a53437..00000000000
--- a/build/pkgs/hatchling/spkg-install.in
+++ /dev/null
@@ -1,2 +0,0 @@
-cd src
-sdh_pip_install .
diff --git a/build/pkgs/importlib_metadata/checksums.ini b/build/pkgs/importlib_metadata/checksums.ini
index 8c978b57c5b..506ef54e9a5 100644
--- 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
index e029aa99b7d..66ce77b7ead 100644
--- 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
deleted file mode 100644
index cc03b63f4f2..00000000000
--- a/build/pkgs/importlib_metadata/spkg-install.in
+++ /dev/null
@@ -1,14 +0,0 @@
-if [ -z "$SAGE_LOCAL" ]; then
-    echo >&2 "SAGE_LOCAL undefined ... exiting"
-    echo >&2 "Maybe run 'sage --sh'?"
-    exit 1
-fi
-
-cd src
-
-sdh_pip_install .
-
-if [ $? -ne 0 ]; then
-    echo "Error installing importlib_metadata ... exiting"
-    exit 1
-fi
diff --git a/build/pkgs/importlib_resources/checksums.ini b/build/pkgs/importlib_resources/checksums.ini
index 39040fbf296..e733e142b52 100644
--- 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
index 655283898b7..30f71335acb 100644
--- 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
index dfda3e0b4f0..f3b5af39e43 100644
--- 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
deleted file mode 100644
index 37ac1a53437..00000000000
--- a/build/pkgs/importlib_resources/spkg-install.in
+++ /dev/null
@@ -1,2 +0,0 @@
-cd src
-sdh_pip_install .
diff --git a/build/pkgs/nbconvert/spkg-install.in b/build/pkgs/nbconvert/spkg-install.in
deleted file mode 100644
index deba1bb42bb..00000000000
--- a/build/pkgs/nbconvert/spkg-install.in
+++ /dev/null
@@ -1 +0,0 @@
-cd src && sdh_pip_install .
diff --git a/build/pkgs/pathspec/checksums.ini b/build/pkgs/pathspec/checksums.ini
index a98c270d6e1..a562884cca1 100644
--- 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
index 47296a7bace..644ad35f773 100644
--- 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
index 5eef0f10e8c..34a83616bb5 100644
--- 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
deleted file mode 100644
index 37ac1a53437..00000000000
--- a/build/pkgs/pathspec/spkg-install.in
+++ /dev/null
@@ -1,2 +0,0 @@
-cd src
-sdh_pip_install .
diff --git a/build/pkgs/pip/checksums.ini b/build/pkgs/pip/checksums.ini
index 52c2edb31f2..0558c5caa45 100644
--- 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
index dac3579f7e3..d45a397db36 100644
--- 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
index 651f5c1dc1e..567543149db 100644
--- 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
index 3e3f6bbc94e..61007a3b8c8 100644
--- 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
index 99113c48626..3757f701faf 100644
--- 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
index 952ebfb66cd..644ad35f773 100644
--- 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
index afad818663d..ee74734aa22 100644
--- 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
deleted file mode 100644
index 37ac1a53437..00000000000
--- a/build/pkgs/platformdirs/spkg-install.in
+++ /dev/null
@@ -1,2 +0,0 @@
-cd src
-sdh_pip_install .
diff --git a/build/pkgs/pluggy/dependencies b/build/pkgs/pluggy/dependencies
index 47296a7bace..644ad35f773 100644
--- 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
index 12067bf5c3e..39c6d3527b3 100644
--- 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
index 150e3c25335..1a88d2a7464 100644
--- 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
index d45a397db36..644ad35f773 100644
--- 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
index fc312b9c8c1..2c021f541a8 100644
--- 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
deleted file mode 100644
index 09a8b8f65ce..00000000000
--- a/build/pkgs/setuptools/spkg-install.in
+++ /dev/null
@@ -1,5 +0,0 @@
-cd src
-# Use --single-version-externally-managed to prevent setuptools from installing itself with easy_install
-python3 setup.py --no-user-cfg install \
-            --single-version-externally-managed --root="$SAGE_DESTDIR" || \
-        sdh_die "Error building / installing setuptools for Python ${vers}"
diff --git a/build/pkgs/setuptools_wheel/SPKG.rst b/build/pkgs/setuptools_wheel/SPKG.rst
deleted file mode 100644
index c78602a296a..00000000000
--- a/build/pkgs/setuptools_wheel/SPKG.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-setuptools_wheel: Build the setuptools package as a wheel
-=========================================================
-
-After installing setuptools and wheel, we build a wheel of setuptools
-to complete the set of wheels stored in our wheelhouse.
diff --git a/build/pkgs/setuptools_wheel/checksums.ini b/build/pkgs/setuptools_wheel/checksums.ini
deleted file mode 120000
index 4f64d3ce107..00000000000
--- a/build/pkgs/setuptools_wheel/checksums.ini
+++ /dev/null
@@ -1 +0,0 @@
-../setuptools/checksums.ini
\ No newline at end of file
diff --git a/build/pkgs/setuptools_wheel/dependencies b/build/pkgs/setuptools_wheel/dependencies
deleted file mode 100644
index dac3579f7e3..00000000000
--- a/build/pkgs/setuptools_wheel/dependencies
+++ /dev/null
@@ -1,4 +0,0 @@
- setuptools wheel | $(PYTHON)
-
-----------
-All lines of this file are ignored except the first.
diff --git a/build/pkgs/setuptools_wheel/distros b/build/pkgs/setuptools_wheel/distros
deleted file mode 120000
index b22be5c01a6..00000000000
--- a/build/pkgs/setuptools_wheel/distros
+++ /dev/null
@@ -1 +0,0 @@
-../setuptools/distros
\ No newline at end of file
diff --git a/build/pkgs/setuptools_wheel/install-requires.txt b/build/pkgs/setuptools_wheel/install-requires.txt
deleted file mode 120000
index c5cfb4ff0a9..00000000000
--- a/build/pkgs/setuptools_wheel/install-requires.txt
+++ /dev/null
@@ -1 +0,0 @@
-../setuptools/install-requires.txt
\ No newline at end of file
diff --git a/build/pkgs/setuptools_wheel/package-version.txt b/build/pkgs/setuptools_wheel/package-version.txt
deleted file mode 120000
index 5268dbec8f6..00000000000
--- a/build/pkgs/setuptools_wheel/package-version.txt
+++ /dev/null
@@ -1 +0,0 @@
-../setuptools/package-version.txt
\ No newline at end of file
diff --git a/build/pkgs/setuptools_wheel/spkg-configure.m4 b/build/pkgs/setuptools_wheel/spkg-configure.m4
deleted file mode 100644
index db71392a8b0..00000000000
--- a/build/pkgs/setuptools_wheel/spkg-configure.m4
+++ /dev/null
@@ -1 +0,0 @@
-SAGE_SPKG_CONFIGURE([setuptools_wheel], [SAGE_PYTHON_PACKAGE_CHECK([setuptools_wheel])])
diff --git a/build/pkgs/setuptools_wheel/spkg-install.in b/build/pkgs/setuptools_wheel/spkg-install.in
deleted file mode 100644
index 7fdd493b5aa..00000000000
--- a/build/pkgs/setuptools_wheel/spkg-install.in
+++ /dev/null
@@ -1,3 +0,0 @@
-cd src
-sdh_setup_bdist_wheel
-sdh_store_wheel .
diff --git a/build/pkgs/setuptools_wheel/type b/build/pkgs/setuptools_wheel/type
deleted file mode 100644
index a6a7b9cd726..00000000000
--- a/build/pkgs/setuptools_wheel/type
+++ /dev/null
@@ -1 +0,0 @@
-standard
diff --git a/build/pkgs/trove_classifiers/checksums.ini b/build/pkgs/trove_classifiers/checksums.ini
index d59736dbac2..7350f444667 100644
--- a/build/pkgs/trove_classifiers/checksums.ini
+++ b/build/pkgs/trove_classifiers/checksums.ini
@@ -1,5 +1,5 @@
-tarball=trove-classifiers-VERSION.tar.gz
-sha1=c6821e6c6d57dc2eec2d4156d63cdca939373759
-md5=154ae4cdb69ac37bb35a35c6fbc477cd
-cksum=84032195
-upstream_url=https://pypi.io/packages/source/t/trove_classifiers/trove-classifiers-VERSION.tar.gz
+tarball=trove_classifiers-VERSION-py3-none-any.whl
+sha1=c341abee77b5c87d913b86dc587e544553f0658c
+md5=78e67f128f53b8417134429192810701
+cksum=3034057088
+upstream_url=https://pypi.io/packages/py3/t/trove_classifiers/trove_classifiers-VERSION-py3-none-any.whl
diff --git a/build/pkgs/trove_classifiers/dependencies b/build/pkgs/trove_classifiers/dependencies
index 2134b2a4179..cbe3cae5550 100644
--- a/build/pkgs/trove_classifiers/dependencies
+++ b/build/pkgs/trove_classifiers/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) calver | $(PYTHON_TOOLCHAIN)
+calver | pip $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/trove_classifiers/package-version.txt b/build/pkgs/trove_classifiers/package-version.txt
index b82d6dba095..a33bd2f9968 100644
--- a/build/pkgs/trove_classifiers/package-version.txt
+++ b/build/pkgs/trove_classifiers/package-version.txt
@@ -1 +1 @@
-2023.11.14
+2023.11.29
diff --git a/build/pkgs/trove_classifiers/spkg-install.in b/build/pkgs/trove_classifiers/spkg-install.in
deleted file mode 100644
index 37ac1a53437..00000000000
--- a/build/pkgs/trove_classifiers/spkg-install.in
+++ /dev/null
@@ -1,2 +0,0 @@
-cd src
-sdh_pip_install .
diff --git a/build/pkgs/virtualenv/checksums.ini b/build/pkgs/virtualenv/checksums.ini
index b7def1fa7e0..90a2a903926 100644
--- a/build/pkgs/virtualenv/checksums.ini
+++ b/build/pkgs/virtualenv/checksums.ini
@@ -1,5 +1,5 @@
 tarball=virtualenv-VERSION-py3-none-any.whl
-sha1=a17fc6409d29b7e7b1427f37496bfc0fa399f9bf
-md5=6374ee91c1ed02956a334aa01d9414ed
-cksum=31593789
+sha1=9c942063d76d85361f0567b59cce8238c57f1183
+md5=7dec1148d91180767ae908dc49a7ebf5
+cksum=3612060825
 upstream_url=https://pypi.io/packages/py3/v/virtualenv/virtualenv-VERSION-py3-none-any.whl
diff --git a/build/pkgs/virtualenv/dependencies b/build/pkgs/virtualenv/dependencies
index b0e964bba0c..148ef28948e 100644
--- a/build/pkgs/virtualenv/dependencies
+++ b/build/pkgs/virtualenv/dependencies
@@ -1,4 +1,4 @@
-distlib filelock platformdirs | $(PYTHON_TOOLCHAIN) $(PYTHON)
+distlib filelock platformdirs | pip $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/virtualenv/package-version.txt b/build/pkgs/virtualenv/package-version.txt
index b744a5a46cb..242a1e92b72 100644
--- a/build/pkgs/virtualenv/package-version.txt
+++ b/build/pkgs/virtualenv/package-version.txt
@@ -1 +1 @@
-20.24.4
+20.25.0
diff --git a/build/pkgs/wheel/checksums.ini b/build/pkgs/wheel/checksums.ini
index b12a1973b0c..4f2b8c5c534 100644
--- a/build/pkgs/wheel/checksums.ini
+++ b/build/pkgs/wheel/checksums.ini
@@ -1,5 +1,5 @@
-tarball=wheel-VERSION.tar.gz
-sha1=34a787f7069762e267e5ed62ed31cc9c87ea910b
-md5=06271a9e90c948b7e93dd7ce0fd90272
-cksum=444550709
-upstream_url=https://pypi.io/packages/source/w/wheel/wheel-VERSION.tar.gz
+tarball=wheel-VERSION-py3-none-any.whl
+sha1=fcf4ad8d5d8216d661bc98eede0d9210cbc5b697
+md5=779d91395ceb12e15e3a585b30b53f9f
+cksum=1421399426
+upstream_url=https://pypi.io/packages/py3/w/wheel/wheel-VERSION-py3-none-any.whl
diff --git a/build/pkgs/wheel/dependencies b/build/pkgs/wheel/dependencies
index a8e327be793..644ad35f773 100644
--- a/build/pkgs/wheel/dependencies
+++ b/build/pkgs/wheel/dependencies
@@ -1,4 +1,4 @@
- setuptools | $(PYTHON)
+ | pip $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/wheel/package-version.txt b/build/pkgs/wheel/package-version.txt
index 6599454d402..787ffc30a81 100644
--- a/build/pkgs/wheel/package-version.txt
+++ b/build/pkgs/wheel/package-version.txt
@@ -1 +1 @@
-0.41.2
+0.42.0
diff --git a/build/pkgs/wheel/spkg-install.in b/build/pkgs/wheel/spkg-install.in
deleted file mode 100644
index 5ad5c08fe0e..00000000000
--- a/build/pkgs/wheel/spkg-install.in
+++ /dev/null
@@ -1,13 +0,0 @@
-cd src
-
-python3 setup.py --no-user-cfg install \
-    --single-version-externally-managed --root="$SAGE_DESTDIR" || \
-        sdh_die "Error building / installing package 'wheel'"
-
-# Now build a wheel so that we have a complete set of wheels.
-
-# Because of staging, we cannot use the installed 'wheel' package yet.
-export PYTHONPATH="$(pwd)/src"
-
-sdh_setup_bdist_wheel
-sdh_store_wheel .
diff --git a/build/pkgs/zipp/checksums.ini b/build/pkgs/zipp/checksums.ini
index 66cd13339d6..7c9d001b307 100644
--- a/build/pkgs/zipp/checksums.ini
+++ b/build/pkgs/zipp/checksums.ini
@@ -1,5 +1,5 @@
-tarball=zipp-VERSION.tar.gz
-sha1=a9f9aebc205b7829c43b34e79c3f87c42b183176
-md5=a4cf8c530da863c27a04251724436681
-cksum=1303269799
-upstream_url=https://pypi.io/packages/source/z/zipp/zipp-VERSION.tar.gz
+tarball=zipp-VERSION-py3-none-any.whl
+sha1=8dd92e1b777b02ec6e1ebe72926d32a82c58b246
+md5=d93f0b8485000b37800a6de09ed6c1cb
+cksum=3547254189
+upstream_url=https://pypi.io/packages/py3/z/zipp/zipp-VERSION-py3-none-any.whl
diff --git a/build/pkgs/zipp/dependencies b/build/pkgs/zipp/dependencies
index 995ddecb8f4..644ad35f773 100644
--- a/build/pkgs/zipp/dependencies
+++ b/build/pkgs/zipp/dependencies
@@ -1,4 +1,4 @@
- | $(PYTHON_TOOLCHAIN) setuptools_scm $(PYTHON)
+ | pip $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/zipp/spkg-install.in b/build/pkgs/zipp/spkg-install.in
deleted file mode 100644
index 6d596586150..00000000000
--- a/build/pkgs/zipp/spkg-install.in
+++ /dev/null
@@ -1,14 +0,0 @@
-if [ -z "$SAGE_LOCAL" ]; then
-    echo >&2 "SAGE_LOCAL undefined ... exiting"
-    echo >&2 "Maybe run 'sage --sh'?"
-    exit 1
-fi
-
-cd src
-
-sdh_pip_install .
-
-if [ $? -ne 0 ]; then
-    echo "Error installing zipp ... exiting"
-    exit 1
-fi
diff --git a/pkgs/sagemath-bliss/pyproject.toml.m4 b/pkgs/sagemath-bliss/pyproject.toml.m4
index df61e7fac6a..40bfebf2489 100644
--- a/pkgs/sagemath-bliss/pyproject.toml.m4
+++ b/pkgs/sagemath-bliss/pyproject.toml.m4
@@ -2,7 +2,7 @@ include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*-
 [build-system]
 # Minimum requirements for the build system to execute.
 requires = [
-    SPKG_INSTALL_REQUIRES_setuptools_wheel
+    SPKG_INSTALL_REQUIRES_setuptools
     SPKG_INSTALL_REQUIRES_sage_conf
     SPKG_INSTALL_REQUIRES_sage_setup
     SPKG_INSTALL_REQUIRES_sagemath_environment
diff --git a/pkgs/sagemath-categories/pyproject.toml.m4 b/pkgs/sagemath-categories/pyproject.toml.m4
index 72c75ccd11e..eed48a1db15 100644
--- a/pkgs/sagemath-categories/pyproject.toml.m4
+++ b/pkgs/sagemath-categories/pyproject.toml.m4
@@ -2,7 +2,7 @@ include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*-
 [build-system]
 # Minimum requirements for the build system to execute.
 requires = [
-    SPKG_INSTALL_REQUIRES_setuptools_wheel
+    SPKG_INSTALL_REQUIRES_setuptools
     SPKG_INSTALL_REQUIRES_wheel
     SPKG_INSTALL_REQUIRES_sage_setup
     SPKG_INSTALL_REQUIRES_sagemath_environment
diff --git a/pkgs/sagemath-coxeter3/pyproject.toml.m4 b/pkgs/sagemath-coxeter3/pyproject.toml.m4
index a8d0e52a4b0..9f9c9dedd5e 100644
--- a/pkgs/sagemath-coxeter3/pyproject.toml.m4
+++ b/pkgs/sagemath-coxeter3/pyproject.toml.m4
@@ -2,7 +2,7 @@ include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*-
 [build-system]
 # Minimum requirements for the build system to execute.
 requires = [
-    SPKG_INSTALL_REQUIRES_setuptools_wheel
+    SPKG_INSTALL_REQUIRES_setuptools
     SPKG_INSTALL_REQUIRES_sage_setup
     SPKG_INSTALL_REQUIRES_sagemath_environment
     SPKG_INSTALL_REQUIRES_cython
diff --git a/pkgs/sagemath-environment/pyproject.toml.m4 b/pkgs/sagemath-environment/pyproject.toml.m4
index 4061c8c46eb..44ddd190f99 100644
--- a/pkgs/sagemath-environment/pyproject.toml.m4
+++ b/pkgs/sagemath-environment/pyproject.toml.m4
@@ -2,7 +2,7 @@ include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*-
 [build-system]
 # Minimum requirements for the build system to execute.
 requires = [
-    SPKG_INSTALL_REQUIRES_setuptools_wheel
+    SPKG_INSTALL_REQUIRES_setuptools
     SPKG_INSTALL_REQUIRES_wheel
 ]
 build-backend = "setuptools.build_meta"
diff --git a/pkgs/sagemath-mcqd/pyproject.toml.m4 b/pkgs/sagemath-mcqd/pyproject.toml.m4
index c94aface3fd..55a58611334 100644
--- a/pkgs/sagemath-mcqd/pyproject.toml.m4
+++ b/pkgs/sagemath-mcqd/pyproject.toml.m4
@@ -2,7 +2,7 @@ include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*-
 [build-system]
 # Minimum requirements for the build system to execute.
 requires = [
-    SPKG_INSTALL_REQUIRES_setuptools_wheel
+    SPKG_INSTALL_REQUIRES_setuptools
     SPKG_INSTALL_REQUIRES_sage_setup
     SPKG_INSTALL_REQUIRES_sagemath_environment
     SPKG_INSTALL_REQUIRES_cython
diff --git a/pkgs/sagemath-meataxe/pyproject.toml.m4 b/pkgs/sagemath-meataxe/pyproject.toml.m4
index 0c8fd46d8be..b4a504c4f1f 100644
--- a/pkgs/sagemath-meataxe/pyproject.toml.m4
+++ b/pkgs/sagemath-meataxe/pyproject.toml.m4
@@ -2,7 +2,7 @@ include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*-
 [build-system]
 # Minimum requirements for the build system to execute.
 requires = [
-    SPKG_INSTALL_REQUIRES_setuptools_wheel
+    SPKG_INSTALL_REQUIRES_setuptools
     SPKG_INSTALL_REQUIRES_sage_setup
     SPKG_INSTALL_REQUIRES_sagemath_environment
     SPKG_INSTALL_REQUIRES_cython
diff --git a/pkgs/sagemath-objects/pyproject.toml.m4 b/pkgs/sagemath-objects/pyproject.toml.m4
index 9214f1ffb8d..a8d7d83a44a 100644
--- a/pkgs/sagemath-objects/pyproject.toml.m4
+++ b/pkgs/sagemath-objects/pyproject.toml.m4
@@ -2,7 +2,7 @@ include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*-
 [build-system]
 # Minimum requirements for the build system to execute.
 requires = [
-    SPKG_INSTALL_REQUIRES_setuptools_wheel
+    SPKG_INSTALL_REQUIRES_setuptools
     SPKG_INSTALL_REQUIRES_wheel
     SPKG_INSTALL_REQUIRES_sage_setup
     SPKG_INSTALL_REQUIRES_sagemath_environment
diff --git a/pkgs/sagemath-repl/pyproject.toml.m4 b/pkgs/sagemath-repl/pyproject.toml.m4
index dfdfb692c9b..2bc276158a4 100644
--- a/pkgs/sagemath-repl/pyproject.toml.m4
+++ b/pkgs/sagemath-repl/pyproject.toml.m4
@@ -2,7 +2,7 @@ include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*-
 [build-system]
 # Minimum requirements for the build system to execute.
 requires = [
-    SPKG_INSTALL_REQUIRES_setuptools_wheel
+    SPKG_INSTALL_REQUIRES_setuptools
     SPKG_INSTALL_REQUIRES_wheel
 ]
 build-backend = "setuptools.build_meta"
diff --git a/pkgs/sagemath-sirocco/pyproject.toml.m4 b/pkgs/sagemath-sirocco/pyproject.toml.m4
index 55e400738d7..6f2874254ab 100644
--- a/pkgs/sagemath-sirocco/pyproject.toml.m4
+++ b/pkgs/sagemath-sirocco/pyproject.toml.m4
@@ -2,7 +2,7 @@ include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*-
 [build-system]
 # Minimum requirements for the build system to execute.
 requires = [
-    SPKG_INSTALL_REQUIRES_setuptools_wheel
+    SPKG_INSTALL_REQUIRES_setuptools
     SPKG_INSTALL_REQUIRES_sage_setup
     SPKG_INSTALL_REQUIRES_sagemath_environment
     SPKG_INSTALL_REQUIRES_cython
diff --git a/pkgs/sagemath-tdlib/pyproject.toml.m4 b/pkgs/sagemath-tdlib/pyproject.toml.m4
index 8e3bcdd988f..d3efaf52cc1 100644
--- a/pkgs/sagemath-tdlib/pyproject.toml.m4
+++ b/pkgs/sagemath-tdlib/pyproject.toml.m4
@@ -2,7 +2,7 @@ include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*-
 [build-system]
 # Minimum requirements for the build system to execute.
 requires = [
-    SPKG_INSTALL_REQUIRES_setuptools_wheel
+    SPKG_INSTALL_REQUIRES_setuptools
     SPKG_INSTALL_REQUIRES_sage_setup
     SPKG_INSTALL_REQUIRES_sagemath_environment
     SPKG_INSTALL_REQUIRES_cython
diff --git a/src/pyproject.toml.m4 b/src/pyproject.toml.m4
index 2b61ea041ea..2d60708affa 100644
--- a/src/pyproject.toml.m4
+++ b/src/pyproject.toml.m4
@@ -7,7 +7,7 @@ requires = [
     # https://github.com/pypa/pip/issues/6144
      esyscmd(`sage-get-system-packages install-requires-toml \
         sage_conf      \
-        setuptools_wheel \
+        setuptools \
         wheel          \
         sage_setup     \
         cypari         \