From abf2943d3f7cfc20fbf97db6b5b7f75e44e7f658 Mon Sep 17 00:00:00 2001
From: Andrew Hamilton <and_hamilton@yahoo.com>
Date: Thu, 19 Dec 2024 08:06:07 +1000
Subject: [PATCH] packaging: Switch over to pyproject.toml from setup.py

---
 pyproject.toml | 24 ++++++++++++++++++
 setup.py       | 23 -----------------
 uv.lock        | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 92 insertions(+), 23 deletions(-)
 create mode 100644 pyproject.toml
 delete mode 100755 setup.py
 create mode 100644 uv.lock

diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 0000000..1da47f8
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,24 @@
+tool.uv.package = true
+
+[project]
+name = "diff-edit"
+version = "v2024.12.19"
+description = "Edit two files side by side, showing differences."
+readme = "README.md"
+authors = [
+    { name = "Andrew Hamilton", email = "and_hamilton@yahoo.com" },
+]
+requires-python = ">=3.11"
+dependencies = [
+    "docopt==0.6.2",
+    "fill3 @ git+https://gitlab.com/ahamilton/eris@v2024.12.18#subdirectory=fill3",
+    "lscolors @ git+https://gitlab.com/ahamilton/eris@v2024.12.18#subdirectory=lscolors",
+    "pygments==2.10.0",
+    "termstr @ git+https://gitlab.com/ahamilton/eris@v2024.12.18#subdirectory=termstr",
+]
+
+[project.scripts]
+diff-edit = "diff_edit:main"
+
+[project.urls]
+Homepage = "https://github.com/ahamilton/diff-edit"
diff --git a/setup.py b/setup.py
deleted file mode 100755
index d55a8f9..0000000
--- a/setup.py
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env python3
-
-
-try:
-    from setuptools import setup
-except ImportError:
-    from distutils.core import setup
-
-
-setup(name="diff-edit",
-      version="v2022.03.16",
-      description="Edit two files side by side, showing differences.",
-      url="https://github.com/ahamilton/diff-edit",
-      author="Andrew Hamilton",
-      author_email="and_hamilton@yahoo.com",
-      license="Artistic 2.0",
-      packages=["diff_edit"],
-      entry_points={"console_scripts": ["diff-edit=diff_edit:main"]},
-      install_requires=[
-          "pygments==2.10.0", "docopt==0.6.2",
-          "termstr @ git+https://github.com/ahamilton/eris@v2022.05.26#subdirectory=termstr",
-          "fill3 @ git+https://github.com/ahamilton/eris@v2022.05.26#subdirectory=fill3",
-          "lscolors @ git+https://github.com/ahamilton/eris@v2022.05.26#subdirectory=lscolors"])
diff --git a/uv.lock b/uv.lock
new file mode 100644
index 0000000..6791c5e
--- /dev/null
+++ b/uv.lock
@@ -0,0 +1,68 @@
+version = 1
+requires-python = ">=3.11"
+
+[[package]]
+name = "cwcwidth"
+version = "0.1.5"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/38/17/aadd0c6190dca91aa27c4d7e84d69d30fdf4966e7764247cdc395f8fe7d9/cwcwidth-0.1.5.tar.gz", hash = "sha256:2c840e7d85f6de45c45986b416d79312c91882e1121b78d4c347e49c4238c09d", size = 11071 }
+
+[[package]]
+name = "diff-edit"
+version = "2022.3.16"
+source = { editable = "." }
+dependencies = [
+    { name = "docopt" },
+    { name = "fill3" },
+    { name = "lscolors" },
+    { name = "pygments" },
+    { name = "termstr" },
+]
+
+[package.metadata]
+requires-dist = [
+    { name = "docopt", specifier = "==0.6.2" },
+    { name = "fill3", git = "https://gitlab.com/ahamilton/eris?subdirectory=fill3&rev=v2024.12.18" },
+    { name = "lscolors", git = "https://gitlab.com/ahamilton/eris?subdirectory=lscolors&rev=v2024.12.18" },
+    { name = "pygments", specifier = "==2.10.0" },
+    { name = "termstr", git = "https://gitlab.com/ahamilton/eris?subdirectory=termstr&rev=v2024.12.18" },
+]
+
+[[package]]
+name = "docopt"
+version = "0.6.2"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/a2/55/8f8cab2afd404cf578136ef2cc5dfb50baa1761b68c9da1fb1e4eed343c9/docopt-0.6.2.tar.gz", hash = "sha256:49b3a825280bd66b3aa83585ef59c4a8c82f2c8a522dbe754a8bc8d08c85c491", size = 25901 }
+
+[[package]]
+name = "fill3"
+version = "2024.12.18"
+source = { git = "https://gitlab.com/ahamilton/eris?subdirectory=fill3&rev=v2024.12.18#42acd6db75cfb366e4f6b5de0bf7c7508eec6796" }
+dependencies = [
+    { name = "termstr" },
+]
+
+[[package]]
+name = "lscolors"
+version = "2024.12.18"
+source = { git = "https://gitlab.com/ahamilton/eris?subdirectory=lscolors&rev=v2024.12.18#42acd6db75cfb366e4f6b5de0bf7c7508eec6796" }
+dependencies = [
+    { name = "termstr" },
+]
+
+[[package]]
+name = "pygments"
+version = "2.10.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/b7/b3/5cba26637fe43500d4568d0ee7b7362de1fb29c0e158d50b4b69e9a40422/Pygments-2.10.0.tar.gz", hash = "sha256:f398865f7eb6874156579fdf36bc840a03cab64d1cde9e93d68f46a425ec52c6", size = 4052321 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/78/c8/8d9be2f72d8f465461f22b5f199c04f7ada933add4dae6e2468133c17471/Pygments-2.10.0-py3-none-any.whl", hash = "sha256:b8e67fe6af78f492b3c4b3e2970c0624cbf08beb1e493b2c99b9fa1b67a20380", size = 1015195 },
+]
+
+[[package]]
+name = "termstr"
+version = "2024.12.18"
+source = { git = "https://gitlab.com/ahamilton/eris?subdirectory=termstr&rev=v2024.12.18#42acd6db75cfb366e4f6b5de0bf7c7508eec6796" }
+dependencies = [
+    { name = "cwcwidth" },
+]