diff --git a/build/pkgs/asttokens/checksums.ini b/build/pkgs/asttokens/checksums.ini
index 9c5d57c3a17..d9de4a44ea3 100644
--- a/build/pkgs/asttokens/checksums.ini
+++ b/build/pkgs/asttokens/checksums.ini
@@ -1,4 +1,4 @@
-tarball=asttokens-VERSION.tar.gz
-sha1=d522a139240293953c99d32ca62c41542babb963
-sha256=b03869718ba9a6eb027e134bfdf69f38a236d681c83c160d510768af11254ba0
-upstream_url=https://pypi.io/packages/source/a/asttokens/asttokens-VERSION.tar.gz
+tarball=asttokens-VERSION-py2.py3-none-any.whl
+sha1=69a9448cd7fad3007a66f464f9daa35dd28183a6
+sha256=051ed49c3dcae8913ea7cd08e46a606dba30b79993209636c4875bc1d637bc24
+upstream_url=https://pypi.io/packages/py2.py3/a/asttokens/asttokens-VERSION-py2.py3-none-any.whl
diff --git a/build/pkgs/asttokens/dependencies b/build/pkgs/asttokens/dependencies
index 47296a7bace..cc5427c91ec 100644
--- a/build/pkgs/asttokens/dependencies
+++ b/build/pkgs/asttokens/dependencies
@@ -1,4 +1,4 @@
- | $(PYTHON_TOOLCHAIN) $(PYTHON)
+six | pip $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/asttokens/spkg-install.in b/build/pkgs/asttokens/spkg-install.in
deleted file mode 100644
index 37ac1a53437..00000000000
--- a/build/pkgs/asttokens/spkg-install.in
+++ /dev/null
@@ -1,2 +0,0 @@
-cd src
-sdh_pip_install .
diff --git a/build/pkgs/cppy/checksums.ini b/build/pkgs/cppy/checksums.ini
index 8c1171ff28d..d042532c770 100644
--- a/build/pkgs/cppy/checksums.ini
+++ b/build/pkgs/cppy/checksums.ini
@@ -1,4 +1,4 @@
-tarball=cppy-VERSION.tar.gz
-sha1=c82ee7a4f38e302bfe4de2a695d2bdfefb69951f
-sha256=83b43bf17b1085ac15c5debdb42154f138b928234b21447358981f69d0d6fe1b
-upstream_url=https://files.pythonhosted.org/packages/source/c/cppy/cppy-VERSION.tar.gz
+tarball=cppy-VERSION-py3-none-any.whl
+sha1=57304a8ceaaf7cb34e4315aa9b8084b17fc0332c
+sha256=c5b5eac3d3f42593a07d35275b0bc27f447b76b9ad8f27c62e3cfa286dc1988a
+upstream_url=https://pypi.io/packages/py3/c/cppy/cppy-VERSION-py3-none-any.whl
diff --git a/build/pkgs/cppy/dependencies b/build/pkgs/cppy/dependencies
index 47296a7bace..644ad35f773 100644
--- a/build/pkgs/cppy/dependencies
+++ b/build/pkgs/cppy/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/cppy/spkg-install.in b/build/pkgs/cppy/spkg-install.in
deleted file mode 100644
index deba1bb42bb..00000000000
--- a/build/pkgs/cppy/spkg-install.in
+++ /dev/null
@@ -1 +0,0 @@
-cd src && sdh_pip_install .
diff --git a/build/pkgs/dateutil/checksums.ini b/build/pkgs/dateutil/checksums.ini
index 1c7783ac8fd..e4cd473a834 100644
--- a/build/pkgs/dateutil/checksums.ini
+++ b/build/pkgs/dateutil/checksums.ini
@@ -1,4 +1,4 @@
-tarball=python-dateutil-VERSION.tar.gz
-sha1=c2ba10c775b7a52a4b57cac4d4110a0c0f812a82
-sha256=0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86
-upstream_url=https://files.pythonhosted.org/packages/source/p/python-dateutil/python-dateutil-VERSION.tar.gz
+tarball=python_dateutil-VERSION-py2.py3-none-any.whl
+sha1=323a8e8de7e00a254fadae9c77b1264d56525178
+sha256=a8b2bc7bffae282281c8140a97d3aa9c14da0b136dfe83f850eea9a5f7470427
+upstream_url=https://pypi.io/packages/py2.py3/p/python_dateutil/python_dateutil-VERSION-py2.py3-none-any.whl
diff --git a/build/pkgs/dateutil/dependencies b/build/pkgs/dateutil/dependencies
index a90844872ae..cc5427c91ec 100644
--- a/build/pkgs/dateutil/dependencies
+++ b/build/pkgs/dateutil/dependencies
@@ -1,4 +1,4 @@
- six | $(PYTHON_TOOLCHAIN) $(PYTHON)
+six | pip $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/dateutil/package-version.txt b/build/pkgs/dateutil/package-version.txt
index 1817afea416..629bd405c15 100644
--- a/build/pkgs/dateutil/package-version.txt
+++ b/build/pkgs/dateutil/package-version.txt
@@ -1 +1 @@
-2.8.2
+2.9.0.post0
diff --git a/build/pkgs/dateutil/spkg-install.in b/build/pkgs/dateutil/spkg-install.in
deleted file mode 100644
index 058b1344dc2..00000000000
--- a/build/pkgs/dateutil/spkg-install.in
+++ /dev/null
@@ -1,3 +0,0 @@
-cd src
-
-sdh_pip_install .
diff --git a/build/pkgs/executing/checksums.ini b/build/pkgs/executing/checksums.ini
index 5add559f690..c316d78954d 100644
--- a/build/pkgs/executing/checksums.ini
+++ b/build/pkgs/executing/checksums.ini
@@ -1,4 +1,4 @@
-tarball=executing-VERSION.tar.gz
-sha1=ac9b0cbedd1166bce7a3b9f8542f8d1fafdd8c73
-sha256=19da64c18d2d851112f09c287f8d3dbbdf725ab0e569077efb6cdcbd3497c107
-upstream_url=https://pypi.io/packages/source/e/executing/executing-VERSION.tar.gz
+tarball=executing-VERSION-py2.py3-none-any.whl
+sha1=c32699ff6868bf3613d56795016880fdadde4fc6
+sha256=eac49ca94516ccc753f9fb5ce82603156e590b27525a8bc32cce8ae302eb61bc
+upstream_url=https://pypi.io/packages/py2.py3/e/executing/executing-VERSION-py2.py3-none-any.whl
diff --git a/build/pkgs/executing/dependencies b/build/pkgs/executing/dependencies
index 47296a7bace..644ad35f773 100644
--- a/build/pkgs/executing/dependencies
+++ b/build/pkgs/executing/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/executing/package-version.txt b/build/pkgs/executing/package-version.txt
index 26aaba0e866..38f77a65b30 100644
--- a/build/pkgs/executing/package-version.txt
+++ b/build/pkgs/executing/package-version.txt
@@ -1 +1 @@
-1.2.0
+2.0.1
diff --git a/build/pkgs/executing/spkg-install.in b/build/pkgs/executing/spkg-install.in
deleted file mode 100644
index 37ac1a53437..00000000000
--- a/build/pkgs/executing/spkg-install.in
+++ /dev/null
@@ -1,2 +0,0 @@
-cd src
-sdh_pip_install .
diff --git a/build/pkgs/hatch_fancy_pypi_readme/SPKG.rst b/build/pkgs/hatch_fancy_pypi_readme/SPKG.rst
deleted file mode 100644
index 4e076e4e3cb..00000000000
--- a/build/pkgs/hatch_fancy_pypi_readme/SPKG.rst
+++ /dev/null
@@ -1,18 +0,0 @@
-hatch_fancy_pypi_readme: Fancy PyPI READMEs with Hatch
-======================================================
-
-Description
------------
-
-Fancy PyPI READMEs with Hatch
-
-License
--------
-
-MIT
-
-Upstream Contact
-----------------
-
-https://pypi.org/project/hatch-fancy-pypi-readme/
-
diff --git a/build/pkgs/hatch_fancy_pypi_readme/checksums.ini b/build/pkgs/hatch_fancy_pypi_readme/checksums.ini
deleted file mode 100644
index c624067269f..00000000000
--- a/build/pkgs/hatch_fancy_pypi_readme/checksums.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-tarball=hatch_fancy_pypi_readme-VERSION-py3-none-any.whl
-sha1=25cd6749c20a6803cbf1b6c4d29338c344a8f09c
-sha256=26ec5c7cfd9f604eff0ae6c927d7b197b220706dca203f0aad1928abc81f3a46
-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
deleted file mode 100644
index 36380aee4e7..00000000000
--- a/build/pkgs/hatch_fancy_pypi_readme/dependencies
+++ /dev/null
@@ -1,4 +0,0 @@
-hatchling | pip $(PYTHON)
-
-----------
-All lines of this file are ignored except the first.
diff --git a/build/pkgs/hatch_fancy_pypi_readme/distros/alpine.txt b/build/pkgs/hatch_fancy_pypi_readme/distros/alpine.txt
deleted file mode 100644
index 0046a6941d0..00000000000
--- a/build/pkgs/hatch_fancy_pypi_readme/distros/alpine.txt
+++ /dev/null
@@ -1 +0,0 @@
-py3-hatch-fancy-pypi-readme
diff --git a/build/pkgs/hatch_fancy_pypi_readme/distros/arch.txt b/build/pkgs/hatch_fancy_pypi_readme/distros/arch.txt
deleted file mode 100644
index 7df4edcccd3..00000000000
--- a/build/pkgs/hatch_fancy_pypi_readme/distros/arch.txt
+++ /dev/null
@@ -1 +0,0 @@
-python-hatch-fancy-pypi-readme
diff --git a/build/pkgs/hatch_fancy_pypi_readme/distros/debian.txt b/build/pkgs/hatch_fancy_pypi_readme/distros/debian.txt
deleted file mode 100644
index 804dbbd0a98..00000000000
--- a/build/pkgs/hatch_fancy_pypi_readme/distros/debian.txt
+++ /dev/null
@@ -1 +0,0 @@
-python3-hatch-fancy-pypi-readme
diff --git a/build/pkgs/hatch_fancy_pypi_readme/distros/fedora.txt b/build/pkgs/hatch_fancy_pypi_readme/distros/fedora.txt
deleted file mode 100644
index 7df4edcccd3..00000000000
--- a/build/pkgs/hatch_fancy_pypi_readme/distros/fedora.txt
+++ /dev/null
@@ -1 +0,0 @@
-python-hatch-fancy-pypi-readme
diff --git a/build/pkgs/hatch_fancy_pypi_readme/distros/freebsd.txt b/build/pkgs/hatch_fancy_pypi_readme/distros/freebsd.txt
deleted file mode 100644
index b3e8d47dc5a..00000000000
--- a/build/pkgs/hatch_fancy_pypi_readme/distros/freebsd.txt
+++ /dev/null
@@ -1 +0,0 @@
-devel/py-hatch-fancy-pypi-readme
diff --git a/build/pkgs/hatch_fancy_pypi_readme/distros/gentoo.txt b/build/pkgs/hatch_fancy_pypi_readme/distros/gentoo.txt
deleted file mode 100644
index 88ad9653448..00000000000
--- a/build/pkgs/hatch_fancy_pypi_readme/distros/gentoo.txt
+++ /dev/null
@@ -1 +0,0 @@
-dev-python/hatch-fancy-pypi-readme
diff --git a/build/pkgs/hatch_fancy_pypi_readme/distros/macports.txt b/build/pkgs/hatch_fancy_pypi_readme/distros/macports.txt
deleted file mode 100644
index 442557c9f7f..00000000000
--- a/build/pkgs/hatch_fancy_pypi_readme/distros/macports.txt
+++ /dev/null
@@ -1 +0,0 @@
-py-hatch-fancy-pypi-readme
diff --git a/build/pkgs/hatch_fancy_pypi_readme/distros/opensuse.txt b/build/pkgs/hatch_fancy_pypi_readme/distros/opensuse.txt
deleted file mode 100644
index 7df4edcccd3..00000000000
--- a/build/pkgs/hatch_fancy_pypi_readme/distros/opensuse.txt
+++ /dev/null
@@ -1 +0,0 @@
-python-hatch-fancy-pypi-readme
diff --git a/build/pkgs/hatch_fancy_pypi_readme/package-version.txt b/build/pkgs/hatch_fancy_pypi_readme/package-version.txt
deleted file mode 100644
index 7c974b0f495..00000000000
--- a/build/pkgs/hatch_fancy_pypi_readme/package-version.txt
+++ /dev/null
@@ -1 +0,0 @@
-24.1.0
diff --git a/build/pkgs/hatch_fancy_pypi_readme/spkg-configure.m4 b/build/pkgs/hatch_fancy_pypi_readme/spkg-configure.m4
deleted file mode 100644
index 864f889676d..00000000000
--- a/build/pkgs/hatch_fancy_pypi_readme/spkg-configure.m4
+++ /dev/null
@@ -1,3 +0,0 @@
-SAGE_SPKG_CONFIGURE([hatch_fancy_pypi_readme], [
-  SAGE_PYTHON_PACKAGE_CHECK([hatch_fancy_pypi_readme])
-])
diff --git a/build/pkgs/hatch_fancy_pypi_readme/type b/build/pkgs/hatch_fancy_pypi_readme/type
deleted file mode 100644
index a6a7b9cd726..00000000000
--- a/build/pkgs/hatch_fancy_pypi_readme/type
+++ /dev/null
@@ -1 +0,0 @@
-standard
diff --git a/build/pkgs/hatch_fancy_pypi_readme/version_requirements.txt b/build/pkgs/hatch_fancy_pypi_readme/version_requirements.txt
deleted file mode 100644
index 6d9a1f85903..00000000000
--- a/build/pkgs/hatch_fancy_pypi_readme/version_requirements.txt
+++ /dev/null
@@ -1 +0,0 @@
-hatch-fancy-pypi-readme
diff --git a/build/pkgs/hatch_vcs/SPKG.rst b/build/pkgs/hatch_vcs/SPKG.rst
deleted file mode 100644
index 6c11d8d95fb..00000000000
--- a/build/pkgs/hatch_vcs/SPKG.rst
+++ /dev/null
@@ -1,18 +0,0 @@
-hatch_vcs: Hatch plugin for versioning with your preferred VCS
-==============================================================
-
-Description
------------
-
-Hatch plugin for versioning with your preferred VCS
-
-License
--------
-
-MIT
-
-Upstream Contact
-----------------
-
-https://pypi.org/project/hatch-vcs/
-
diff --git a/build/pkgs/hatch_vcs/checksums.ini b/build/pkgs/hatch_vcs/checksums.ini
deleted file mode 100644
index dcfa6ea3e03..00000000000
--- a/build/pkgs/hatch_vcs/checksums.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-tarball=hatch_vcs-VERSION-py3-none-any.whl
-sha1=a4da813bf9a745ed2020bf462f4bc19a1ab7fc11
-sha256=b8a2b6bee54cf6f9fc93762db73890017ae59c9081d1038a41f16235ceaf8b2c
-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
deleted file mode 100644
index 36380aee4e7..00000000000
--- a/build/pkgs/hatch_vcs/dependencies
+++ /dev/null
@@ -1,4 +0,0 @@
-hatchling | pip $(PYTHON)
-
-----------
-All lines of this file are ignored except the first.
diff --git a/build/pkgs/hatch_vcs/distros/alpine.txt b/build/pkgs/hatch_vcs/distros/alpine.txt
deleted file mode 100644
index f83237884b5..00000000000
--- a/build/pkgs/hatch_vcs/distros/alpine.txt
+++ /dev/null
@@ -1 +0,0 @@
-py3-hatch-vcs
diff --git a/build/pkgs/hatch_vcs/distros/arch.txt b/build/pkgs/hatch_vcs/distros/arch.txt
deleted file mode 100644
index 8441f14bba2..00000000000
--- a/build/pkgs/hatch_vcs/distros/arch.txt
+++ /dev/null
@@ -1 +0,0 @@
-python-hatch-vcs
diff --git a/build/pkgs/hatch_vcs/distros/debian.txt b/build/pkgs/hatch_vcs/distros/debian.txt
deleted file mode 100644
index 5480b8bcdd9..00000000000
--- a/build/pkgs/hatch_vcs/distros/debian.txt
+++ /dev/null
@@ -1 +0,0 @@
-python3-hatch-vcs
diff --git a/build/pkgs/hatch_vcs/distros/fedora.txt b/build/pkgs/hatch_vcs/distros/fedora.txt
deleted file mode 100644
index 8441f14bba2..00000000000
--- a/build/pkgs/hatch_vcs/distros/fedora.txt
+++ /dev/null
@@ -1 +0,0 @@
-python-hatch-vcs
diff --git a/build/pkgs/hatch_vcs/distros/freebsd.txt b/build/pkgs/hatch_vcs/distros/freebsd.txt
deleted file mode 100644
index 53c6f650d58..00000000000
--- a/build/pkgs/hatch_vcs/distros/freebsd.txt
+++ /dev/null
@@ -1 +0,0 @@
-devel/py-hatch-vcs
diff --git a/build/pkgs/hatch_vcs/distros/gentoo.txt b/build/pkgs/hatch_vcs/distros/gentoo.txt
deleted file mode 100644
index ad6e0d96197..00000000000
--- a/build/pkgs/hatch_vcs/distros/gentoo.txt
+++ /dev/null
@@ -1 +0,0 @@
-dev-python/hatch-vcs
diff --git a/build/pkgs/hatch_vcs/distros/macports.txt b/build/pkgs/hatch_vcs/distros/macports.txt
deleted file mode 100644
index cdccfd5952e..00000000000
--- a/build/pkgs/hatch_vcs/distros/macports.txt
+++ /dev/null
@@ -1 +0,0 @@
-py-hatch-vcs
diff --git a/build/pkgs/hatch_vcs/distros/opensuse.txt b/build/pkgs/hatch_vcs/distros/opensuse.txt
deleted file mode 100644
index cb34dc58d71..00000000000
--- a/build/pkgs/hatch_vcs/distros/opensuse.txt
+++ /dev/null
@@ -1 +0,0 @@
-python-hatch_vcs
diff --git a/build/pkgs/hatch_vcs/distros/void.txt b/build/pkgs/hatch_vcs/distros/void.txt
deleted file mode 100644
index 04e2069fbb3..00000000000
--- a/build/pkgs/hatch_vcs/distros/void.txt
+++ /dev/null
@@ -1 +0,0 @@
-hatch-vcs
diff --git a/build/pkgs/hatch_vcs/package-version.txt b/build/pkgs/hatch_vcs/package-version.txt
deleted file mode 100644
index 1d0ba9ea182..00000000000
--- a/build/pkgs/hatch_vcs/package-version.txt
+++ /dev/null
@@ -1 +0,0 @@
-0.4.0
diff --git a/build/pkgs/hatch_vcs/spkg-configure.m4 b/build/pkgs/hatch_vcs/spkg-configure.m4
deleted file mode 100644
index aa5a1c212df..00000000000
--- a/build/pkgs/hatch_vcs/spkg-configure.m4
+++ /dev/null
@@ -1,3 +0,0 @@
-SAGE_SPKG_CONFIGURE([hatch_vcs], [
-  SAGE_PYTHON_PACKAGE_CHECK([hatch_vcs])
-])
diff --git a/build/pkgs/hatch_vcs/type b/build/pkgs/hatch_vcs/type
deleted file mode 100644
index a6a7b9cd726..00000000000
--- a/build/pkgs/hatch_vcs/type
+++ /dev/null
@@ -1 +0,0 @@
-standard
diff --git a/build/pkgs/hatch_vcs/version_requirements.txt b/build/pkgs/hatch_vcs/version_requirements.txt
deleted file mode 100644
index 04e2069fbb3..00000000000
--- a/build/pkgs/hatch_vcs/version_requirements.txt
+++ /dev/null
@@ -1 +0,0 @@
-hatch-vcs
diff --git a/build/pkgs/httpx/dependencies b/build/pkgs/httpx/dependencies
index 8df93e6d599..666b4944b30 100644
--- a/build/pkgs/httpx/dependencies
+++ b/build/pkgs/httpx/dependencies
@@ -1,4 +1,4 @@
-httpcore | $(PYTHON_TOOLCHAIN) $(PYTHON)
+httpcore anyio sniffio | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/jsonschema/checksums.ini b/build/pkgs/jsonschema/checksums.ini
index 89a23a0d2cf..e709e36e5d3 100644
--- a/build/pkgs/jsonschema/checksums.ini
+++ b/build/pkgs/jsonschema/checksums.ini
@@ -1,4 +1,4 @@
-tarball=jsonschema-VERSION.tar.gz
-sha1=9f762c6c2b92defddf1c441cce8132d021252b2c
-sha256=0f864437ab8b6076ba6707453ef8f98a6a0d512a80e93f8abdb676f737ecb60d
-upstream_url=https://pypi.io/packages/source/j/jsonschema/jsonschema-VERSION.tar.gz
+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
diff --git a/build/pkgs/jsonschema/dependencies b/build/pkgs/jsonschema/dependencies
index 1a62386aa97..8c7c4532c8d 100644
--- a/build/pkgs/jsonschema/dependencies
+++ b/build/pkgs/jsonschema/dependencies
@@ -1,4 +1,4 @@
-jsonschema_specifications pyrsistent attrs importlib_metadata fqdn isoduration jsonpointer uri_template webcolors | $(PYTHON_TOOLCHAIN) hatchling hatch_vcs hatch_fancy_pypi_readme $(PYTHON)
+jsonschema_specifications pyrsistent attrs fqdn isoduration jsonpointer uri_template webcolors | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/jsonschema/spkg-install.in b/build/pkgs/jsonschema/spkg-install.in
deleted file mode 100644
index c2e2e774287..00000000000
--- a/build/pkgs/jsonschema/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 jsonschema ... exiting"
-    exit 1
-fi
diff --git a/build/pkgs/pure_eval/checksums.ini b/build/pkgs/pure_eval/checksums.ini
index 7fb86e03cc4..1cdf6f8d2a4 100644
--- a/build/pkgs/pure_eval/checksums.ini
+++ b/build/pkgs/pure_eval/checksums.ini
@@ -1,4 +1,4 @@
-tarball=pure_eval-VERSION.tar.gz
-sha1=45813e75b359573c2ef49430673812ea3f8f81f2
-sha256=2b45320af6dfaa1750f543d714b6d1c520a1688dec6fd24d339063ce0aaa9ac3
-upstream_url=https://pypi.io/packages/source/p/pure_eval/pure_eval-VERSION.tar.gz
+tarball=pure_eval-VERSION-py3-none-any.whl
+sha1=dbd5eaa9eb5a4910cff5ccd42b570f866f581da4
+sha256=01eaab343580944bc56080ebe0a674b39ec44a945e6d09ba7db3cb8cec289350
+upstream_url=https://pypi.io/packages/py3/p/pure_eval/pure_eval-VERSION-py3-none-any.whl
diff --git a/build/pkgs/pure_eval/dependencies b/build/pkgs/pure_eval/dependencies
index 47296a7bace..644ad35f773 100644
--- a/build/pkgs/pure_eval/dependencies
+++ b/build/pkgs/pure_eval/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/pure_eval/spkg-install.in b/build/pkgs/pure_eval/spkg-install.in
deleted file mode 100644
index 37ac1a53437..00000000000
--- a/build/pkgs/pure_eval/spkg-install.in
+++ /dev/null
@@ -1,2 +0,0 @@
-cd src
-sdh_pip_install .
diff --git a/build/pkgs/py/checksums.ini b/build/pkgs/py/checksums.ini
index 9c10e7b6cf8..a10022af08f 100644
--- a/build/pkgs/py/checksums.ini
+++ b/build/pkgs/py/checksums.ini
@@ -1,4 +1,4 @@
-tarball=py-VERSION.tar.gz
-sha1=bb8aa4f56e3ced1cd61906495150e7ca2dacc10b
-sha256=51c75c4126074b472f746a24399ad32f6053d1b34b68d2fa41e558e6f4a98719
-upstream_url=https://pypi.io/packages/source/p/py/py-VERSION.tar.gz
+tarball=py-VERSION-py2.py3-none-any.whl
+sha1=44002baec8d2184d218bd2fa6049967cd9b4dbb5
+sha256=607c53218732647dff4acdfcd50cb62615cedf612e72d1724fb1a0cc6405b378
+upstream_url=https://pypi.io/packages/py2.py3/p/py/py-VERSION-py2.py3-none-any.whl
diff --git a/build/pkgs/py/dependencies b/build/pkgs/py/dependencies
index 995ddecb8f4..644ad35f773 100644
--- a/build/pkgs/py/dependencies
+++ b/build/pkgs/py/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/py/spkg-install.in b/build/pkgs/py/spkg-install.in
deleted file mode 100644
index 37ac1a53437..00000000000
--- a/build/pkgs/py/spkg-install.in
+++ /dev/null
@@ -1,2 +0,0 @@
-cd src
-sdh_pip_install .
diff --git a/build/pkgs/setuptools_scm/checksums.ini b/build/pkgs/setuptools_scm/checksums.ini
index 7d85feb982f..abae8c0a4f4 100644
--- a/build/pkgs/setuptools_scm/checksums.ini
+++ b/build/pkgs/setuptools_scm/checksums.ini
@@ -1,4 +1,4 @@
 tarball=setuptools_scm-VERSION-py3-none-any.whl
-sha1=cfde7254fe351b69cd4bf02e1b57e0b3c59aa9a6
-sha256=b47844cd2a84b83b3187a5782c71128c28b4c94cad8bfb871da2784a5cb54c4f
+sha1=be606b6acb67714b96e9e1e9a9944feaca504e44
+sha256=897a3226a6fd4a6eb2f068745e49733261a21f70b1bb28fce0339feb978d9af3
 upstream_url=https://pypi.io/packages/py3/s/setuptools_scm/setuptools_scm-VERSION-py3-none-any.whl
diff --git a/build/pkgs/setuptools_scm/package-version.txt b/build/pkgs/setuptools_scm/package-version.txt
index 50c496d20c6..8104cabd36f 100644
--- a/build/pkgs/setuptools_scm/package-version.txt
+++ b/build/pkgs/setuptools_scm/package-version.txt
@@ -1 +1 @@
-8.0.4
+8.1.0
diff --git a/build/pkgs/stack_data/checksums.ini b/build/pkgs/stack_data/checksums.ini
index 5761a624c1e..4f749a287f0 100644
--- a/build/pkgs/stack_data/checksums.ini
+++ b/build/pkgs/stack_data/checksums.ini
@@ -1,4 +1,4 @@
-tarball=stack_data-VERSION.tar.gz
-sha1=7f7627afc47570ffb06924c1b2fbb48e21bac724
-sha256=836a778de4fec4dcd1dcd89ed8abff8a221f58308462e1c4aa2a3cf30148f0b9
-upstream_url=https://pypi.io/packages/source/s/stack_data/stack_data-VERSION.tar.gz
+tarball=stack_data-VERSION-py3-none-any.whl
+sha1=96814b10bdc464e8ef00f4a07c60dd17a3dc9668
+sha256=d5558e0c25a4cb0853cddad3d77da9891a08cb85dd9f9f91b9f8cd66e511e695
+upstream_url=https://pypi.io/packages/py3/s/stack_data/stack_data-VERSION-py3-none-any.whl
diff --git a/build/pkgs/stack_data/dependencies b/build/pkgs/stack_data/dependencies
index 52b3edda4b5..26e1f2a1801 100644
--- a/build/pkgs/stack_data/dependencies
+++ b/build/pkgs/stack_data/dependencies
@@ -1,4 +1,4 @@
- executing asttokens pure_eval | $(PYTHON_TOOLCHAIN) $(PYTHON)
+executing asttokens pure_eval | pip $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/stack_data/spkg-install.in b/build/pkgs/stack_data/spkg-install.in
deleted file mode 100644
index 37ac1a53437..00000000000
--- a/build/pkgs/stack_data/spkg-install.in
+++ /dev/null
@@ -1,2 +0,0 @@
-cd src
-sdh_pip_install .