From fc740927cca5c795b89c514e06fff3687e94e0c5 Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Wed, 12 Mar 2025 23:46:52 -0400
Subject: [PATCH] Switch to modern Python build system

Remove setuptools and use pyproject.toml instead.
---
 .gitignore                |  1 +
 client-cli/pyproject.toml | 21 +++++++++++++++++++++
 client-cli/setup.py       | 20 --------------------
 debian/compat             |  2 +-
 debian/rules              |  5 +++--
 5 files changed, 26 insertions(+), 23 deletions(-)
 create mode 100644 client-cli/pyproject.toml
 delete mode 100644 client-cli/setup.py

diff --git a/.gitignore b/.gitignore
index 2ad6caf6..6b5b18ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ debian/pvc-*/
 debian/*.log
 debian/*.substvars
 debian/files
+client-cli/build/
diff --git a/client-cli/pyproject.toml b/client-cli/pyproject.toml
new file mode 100644
index 00000000..dc7f4ff8
--- /dev/null
+++ b/client-cli/pyproject.toml
@@ -0,0 +1,21 @@
+[build-system]
+requires = ["setuptools", "wheel"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "pvc"
+version = "0.9.107"
+dependencies = [
+    "Click",
+    "PyYAML",
+    "lxml",
+    "colorama",
+    "requests",
+    "requests-toolbelt",
+]
+
+[tool.setuptools]
+packages = ["pvc.cli", "pvc.lib"]
+
+[project.scripts]
+pvc = "pvc.cli.cli:cli"
diff --git a/client-cli/setup.py b/client-cli/setup.py
deleted file mode 100644
index 0ed7167c..00000000
--- a/client-cli/setup.py
+++ /dev/null
@@ -1,20 +0,0 @@
-from setuptools import setup
-
-setup(
-    name="pvc",
-    version="0.9.107",
-    packages=["pvc.cli", "pvc.lib"],
-    install_requires=[
-        "Click",
-        "PyYAML",
-        "lxml",
-        "colorama",
-        "requests",
-        "requests-toolbelt",
-    ],
-    entry_points={
-        "console_scripts": [
-            "pvc = pvc.cli.cli:cli",
-        ],
-    },
-)
diff --git a/debian/compat b/debian/compat
index ec635144..b1bd38b6 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+13
diff --git a/debian/rules b/debian/rules
index cfdabe4d..6080f5c8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,13 +7,14 @@ export DH_VERBOSE = 1
 	dh $@ --with python3
 
 override_dh_python3:
-	cd $(CURDIR)/client-cli; pybuild --system=distutils --dest-dir=../debian/pvc-client-cli/
+	cd $(CURDIR)/client-cli; pybuild --system=pyproject --dest-dir=../debian/pvc-client-cli/
 	mkdir -p debian/pvc-client-cli/usr/lib/python3
 	mv debian/pvc-client-cli/usr/lib/python3*/* debian/pvc-client-cli/usr/lib/python3/
 	rm -r $(CURDIR)/client-cli/.pybuild $(CURDIR)/client-cli/pvc.egg-info
 
 override_dh_auto_clean:
-	find . -name "__pycache__" -o -name ".pybuild" -exec rm -fr {} + || true
+	find $(CURDIR) -name "__pycache__" -o -name ".pybuild" -exec rm -fr {} + || true
+	rm -r $(CURDIR)/client-cli/build
 
 # If you need to rebuild the Sphinx documentation
 # Add spinxdoc to the dh --with line