From f2a0736b2ab6180e10f0fa334953303f257b562d Mon Sep 17 00:00:00 2001
From: David Fraser <david@frasergo.org>
Date: Wed, 10 Apr 2024 07:53:17 +0200
Subject: [PATCH] Enable this to be built and distributed using modern Python3
 Remove dependency on d2to1 which is deprecated, and rather user standard
 setuptools Remove dependency on gitchangelog which also requires d2to1 Bump
 version to 0.1a5

---
 requirements.txt |  4 ++--
 setup.cfg        | 26 ++++++++++++--------------
 setup.py         |  9 +--------
 3 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 06ff9e3..849af0d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,2 @@
-gitchangelog==2.3.0
-Sphinx==1.4.5
+# gitchangelog==2.3.0
+Sphinx==7.2.6
\ No newline at end of file
diff --git a/setup.cfg b/setup.cfg
index 7665e5a..859865f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,17 +1,15 @@
 [metadata]
 name = grapefruit
-version = 0.1a4
-summary = A module to manipulate color information easily.
-description-file =
-  README.rst
-requires-dist =
+version = 0.1a5
+description = A module to manipulate color information easily.
+long_description = file: README.rst
 
 ## sdist info
 author = Xavier Basty
 author_email = xbasty@gmail.com
-home_page = https://github.com/xav/Grapefruit/
+url = https://github.com/xav/Grapefruit/
 keywords = color, colour
-classifier =
+classifiers =
   Programming Language :: Python
   Development Status :: 3 - Alpha
   Intended Audience :: Developers
@@ -20,13 +18,13 @@ classifier =
   Topic :: Software Development :: Libraries :: Python Modules
   Topic :: Multimedia :: Graphics
 
-[files]
-modules = grapefruit
-resources =
-  README.rst = {doc}
-  doc/* = {doc}
-extra_files =
-  setup.py
+[options]
+py_modules = grapefruit
+
+[options.package_data]
+grapefruit =
+  *.rst
+  doc/*
 
 [nosetests]
 verbosity = 3
diff --git a/setup.py b/setup.py
index 53d69ae..6c59ef6 100644
--- a/setup.py
+++ b/setup.py
@@ -14,15 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-try:
-    from setuptools import setup
-except ImportError:
-    from distribute_setup import use_setuptools
-    use_setuptools()
-    from setuptools import setup
+from setuptools import setup
 
 setup(
-    setup_requires=['d2to1'],
     extras_require={'test': ['nose', ]},
-    d2to1=True
 )