From 4d31b513d16c02a68f913052ef9db64c875455c9 Mon Sep 17 00:00:00 2001
From: Tomaz Muraus <tomaz@tomaz.me>
Date: Sun, 2 Mar 2025 17:44:50 +0100
Subject: [PATCH 1/2] Update min version of the tools used for creating a
 release.

---
 pyproject.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index d4e8467f01..0a20747660 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -15,8 +15,8 @@
 
 [build-system]
 requires = [
-    "setuptools~=70.1.1",
-    "wheel~=0.43.0"
+    "setuptools~=75.3.0",
+    "wheel~=0.45.1"
 ]
 build-backend = "setuptools.build_meta"
 

From 3df72b7d10894af0f95db9947c6c19e3072542e4 Mon Sep 17 00:00:00 2001
From: Tomaz Muraus <tomaz@tomaz.me>
Date: Sun, 2 Mar 2025 17:52:53 +0100
Subject: [PATCH 2/2] Improve dist install checks.

Also use python -m build to build sdist tarball as well and
add addition sanity checks to the scripts.
---
 scripts/dist_install_check.sh       | 16 +++++++++++-----
 scripts/dist_wheel_install_check.sh |  7 ++++++-
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/scripts/dist_install_check.sh b/scripts/dist_install_check.sh
index 3ef04b25cf..236eea9ddf 100755
--- a/scripts/dist_install_check.sh
+++ b/scripts/dist_install_check.sh
@@ -18,15 +18,16 @@
 set -e
 
 function cleanup() {
-    rm -f dist/apache*libcloud*.*
+    rm -rf dist/apache*libcloud*.*
+    pip uninstall -y apache-libcloud || true
 }
 
 cleanup
 
 trap cleanup EXIT
 
-# Verify library installs without any dependencies when using python setup.py
-# install
+# Verify library installs without any dependencies when using source
+# tarball
 echo "Running dist install checks"
 python --version
 
@@ -37,9 +38,14 @@ pip show typing && exit 1
 pip show enum34 && exit 1
 pip show apache-libcloud && exit 1
 
-# Install the library
-pip install .
+# Build and install the library
+pip install build
+python -m build
+pip install dist/apache_libcloud-*.tar.gz
+
+# Verify the library has been installed and perform basic sanity check
 pip show apache-libcloud
+python -c "import libcloud; print(libcloud.__version__)"
 
 # Verify all dependencies were installed
 pip show requests
diff --git a/scripts/dist_wheel_install_check.sh b/scripts/dist_wheel_install_check.sh
index 09402581b6..b1b74c7e7f 100755
--- a/scripts/dist_wheel_install_check.sh
+++ b/scripts/dist_wheel_install_check.sh
@@ -20,7 +20,8 @@
 set -e
 
 function cleanup() {
-    rm -f dist/apache*libcloud*.*
+    rm -rf dist/apache*libcloud*.*
+    pip uninstall -y apache-libcloud || true
 }
 
 cleanup
@@ -42,6 +43,10 @@ pip install build
 python -m build
 pip install dist/apache_libcloud-*.whl
 
+# Verify the library has been installed and perform basic sanity check
+pip show apache-libcloud
+python -c "import libcloud; print(libcloud.__version__)"
+
 # Verify all dependencies were installed
 pip show requests
 pip show typing && exit 1