From 4649953b1c3710f43fc9f8b8e44e624d633a7fad Mon Sep 17 00:00:00 2001
From: Eike S R <eike.roehrs@gmail.com>
Date: Fri, 14 Jun 2024 16:17:12 +0200
Subject: [PATCH 1/3] Move other py parts to hatchling; update generator
 version used

Move other py parts of flatdata, e.g., flatadata-inspector and
flatdata-writer to hatchling, so that only one pip build backend is
used.

Also upgrade the flatdata-generator version used to the new version.
This requires also an update of these packages.

Signed-off-by: Eike S R <eike.roehrs@gmail.com>
---
 flatdata-py/pyproject.toml | 45 ++++++++++++++++++++++++++++++++++----
 flatdata-py/setup.py       |  4 ++--
 2 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/flatdata-py/pyproject.toml b/flatdata-py/pyproject.toml
index b5a3c468..9874ecc0 100644
--- a/flatdata-py/pyproject.toml
+++ b/flatdata-py/pyproject.toml
@@ -1,6 +1,43 @@
 [build-system]
-requires = [
-    "setuptools>=42",
-    "wheel"
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[project]
+name = "flatdata-py"
+version = "0.4.7"
+description = "Python 3 implementation of Flatdata"
+readme = "README.md"
+license = ""
+authors = [
+    { name = "Flatdata Developers" },
 ]
-build-backend = "setuptools.build_meta"
\ No newline at end of file
+classifiers = [
+    "License :: OSI Approved :: Apache Software License",
+    "Operating System :: OS Independent",
+    "Programming Language :: Python :: 3",
+]
+dependencies = [
+    "flatdata-generator==0.4.6",
+    "numpy",
+    "pandas",
+]
+
+[project.optional-dependencies]
+inspector = [
+    "IPython",
+]
+
+[project.scripts]
+flatdata-inspector = "flatdata.lib.inspector:main[inspector]"
+flatdata-writer = "flatdata.lib.writer:main[writer]"
+
+[project.urls]
+Homepage = "https://github.com/heremaps/flatdata"
+
+[tool.hatch.build.targets.sdist]
+include = [
+    "/flatdata",
+]
+
+[tool.hatch.build.targets.wheel]
+packages = ["flatdata"]
diff --git a/flatdata-py/setup.py b/flatdata-py/setup.py
index 85269bf4..acb821b2 100755
--- a/flatdata-py/setup.py
+++ b/flatdata-py/setup.py
@@ -6,7 +6,7 @@
 
 setup(
     name="flatdata-py",
-    version="0.4.6",
+    version="0.4.7",
     author="Flatdata Developers",
     description="Python 3 implementation of Flatdata",
     long_description=open(os.path.join(SOURCE_FILEPATH, "README.md")).read(),
@@ -25,7 +25,7 @@
     },
     setup_requires=["wheel"],
     install_requires=[
-        "flatdata-generator==0.4.5",
+        "flatdata-generator==0.4.6",
         "numpy",
         "pandas"
     ],

From 0189a12a84afe7a582ca5eff4de6a04473077080 Mon Sep 17 00:00:00 2001
From: Eike S R <eike.roehrs@gmail.com>
Date: Fri, 14 Jun 2024 16:20:28 +0200
Subject: [PATCH 2/3] Cleanup setup.py

Signed-off-by: Eike S R <eike.roehrs@gmail.com>
---
 flatdata-py/setup.py | 37 -------------------------------------
 1 file changed, 37 deletions(-)
 delete mode 100755 flatdata-py/setup.py

diff --git a/flatdata-py/setup.py b/flatdata-py/setup.py
deleted file mode 100755
index acb821b2..00000000
--- a/flatdata-py/setup.py
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/env python3
-import os
-from setuptools import find_packages, setup
-
-SOURCE_FILEPATH = os.path.dirname(os.path.abspath(__file__))
-
-setup(
-    name="flatdata-py",
-    version="0.4.7",
-    author="Flatdata Developers",
-    description="Python 3 implementation of Flatdata",
-    long_description=open(os.path.join(SOURCE_FILEPATH, "README.md")).read(),
-    long_description_content_type="text/markdown",
-    url="https://github.com/heremaps/flatdata",
-    # we can't use find_namespace_packages as it is only a very recent addition to setuptools
-    packages=["flatdata." + p for p in find_packages("flatdata")],
-    extras_require={
-        "inspector": ["IPython"]
-    },
-    entry_points={
-        "console_scripts": [
-            "flatdata-inspector = flatdata.lib.inspector:main [inspector]",
-            "flatdata-writer = flatdata.lib.writer:main [writer]"
-        ],
-    },
-    setup_requires=["wheel"],
-    install_requires=[
-        "flatdata-generator==0.4.6",
-        "numpy",
-        "pandas"
-    ],
-    classifiers=[
-        "Programming Language :: Python :: 3",
-        "License :: OSI Approved :: Apache Software License",
-        "Operating System :: OS Independent",
-    ],
-)

From a4d0a1699f11a84ac4f41a1dd8968da9047a1796 Mon Sep 17 00:00:00 2001
From: Eike S R <eike.roehrs@gmail.com>
Date: Mon, 17 Jun 2024 13:17:51 +0200
Subject: [PATCH 3/3] requirements txt was mentioning an old version

Signed-off-by: Eike S R <eike.roehrs@gmail.com>
---
 flatdata-py/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flatdata-py/requirements.txt b/flatdata-py/requirements.txt
index 7a0d94dd..0baceec6 100644
--- a/flatdata-py/requirements.txt
+++ b/flatdata-py/requirements.txt
@@ -1,3 +1,3 @@
-flatdata-generator==0.4.5
+flatdata-generator==0.4.6
 numpy
 pandas