From eb7575200abf582d9a9b70809406c30b233bb8ab Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Thu, 21 Jul 2022 22:35:59 -0700
Subject: [PATCH] build/pkgs/setuptools: Use setuptools @ features/pep660

---
 build/pkgs/sagelib/spkg-install            | 2 +-
 build/pkgs/setuptools/checksums.ini        | 8 ++++----
 build/pkgs/setuptools/install-requires.txt | 2 +-
 build/pkgs/setuptools/package-version.txt  | 2 +-
 build/pkgs/setuptools/spkg-install.in      | 3 +++
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/build/pkgs/sagelib/spkg-install b/build/pkgs/sagelib/spkg-install
index 4ae18e5a42f..0986692ae20 100755
--- a/build/pkgs/sagelib/spkg-install
+++ b/build/pkgs/sagelib/spkg-install
@@ -44,7 +44,7 @@ if [ "$SAGE_EDITABLE" = yes ]; then
     # and renamed the distribution to "sagemath-standard").  There is no clean way to uninstall
     # them, so we just use rm.
     (cd "$SITEPACKAGESDIR" && rm -rf sage sage_setup sage-[1-9]*.egg-info sage-[1-9]*.dist-info)
-    time python3 -m pip install --verbose --no-deps --no-index --no-build-isolation --isolated --editable . || exit 1
+    time python3 -m pip install --verbose --no-deps --no-index --find-links=$SAGE_SPKG_WHEELS --isolated --editable . || exit 1
 else
     # Likewise, we should remove the egg-link that may have been installed previously.
     (cd "$SITEPACKAGESDIR" && rm -f sagemath-standard.egg-link)
diff --git a/build/pkgs/setuptools/checksums.ini b/build/pkgs/setuptools/checksums.ini
index 8a9faad33ca..06a612b69ae 100644
--- a/build/pkgs/setuptools/checksums.ini
+++ b/build/pkgs/setuptools/checksums.ini
@@ -1,5 +1,5 @@
 tarball=setuptools-VERSION.tar.gz
-sha1=2a5a4ac384ace22dd10e3dac0a1b6af49e03c596
-md5=d72acb93671bde8e4ca0971866f9cdda
-cksum=2262493785
-upstream_url=https://pypi.io/packages/source/s/setuptools/setuptools-VERSION.tar.gz
+sha1=8da4315b78a1fd0f3c089875166d11affa1a4c2c
+md5=445195629eeff4711f61aaf98ea4486b
+cksum=4015061417
+upstream_url=https://github.com/pypa/setuptools/archive/49e21527f9e59ca881dab360e125bb2b17280694.zip
diff --git a/build/pkgs/setuptools/install-requires.txt b/build/pkgs/setuptools/install-requires.txt
index 0810ca37277..49fe098d9e6 100644
--- a/build/pkgs/setuptools/install-requires.txt
+++ b/build/pkgs/setuptools/install-requires.txt
@@ -1 +1 @@
-setuptools >=49.6.0
+setuptools
diff --git a/build/pkgs/setuptools/package-version.txt b/build/pkgs/setuptools/package-version.txt
index 61f1f83a084..61297011737 100644
--- a/build/pkgs/setuptools/package-version.txt
+++ b/build/pkgs/setuptools/package-version.txt
@@ -1 +1 @@
-63.2.0
+63.2.0+pep660-2022-07-21
diff --git a/build/pkgs/setuptools/spkg-install.in b/build/pkgs/setuptools/spkg-install.in
index 09a8b8f65ce..9d223fccb77 100644
--- a/build/pkgs/setuptools/spkg-install.in
+++ b/build/pkgs/setuptools/spkg-install.in
@@ -1,4 +1,7 @@
 cd src
+# Workaround for "cannot copy tree 'build/scripts-...'" when installing
+# setuptools from the git archive - https://github.com/pypa/setuptools/issues/2586
+python3 setup.py egg_info
 # 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" || \