From 85148fb4726a8729c9b98202e2d30ff86dcbf5b4 Mon Sep 17 00:00:00 2001
From: EmilDohne <86836589+EmilDohne@users.noreply.github.com>
Date: Mon, 26 Feb 2024 11:22:14 +0100
Subject: [PATCH] add def to move stubs to root as well as packaging all
 subdirs

---
 python/psapi-stubs/py.typed |  0
 setup.py                    | 20 ++++++++++++++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)
 delete mode 100644 python/psapi-stubs/py.typed

diff --git a/python/psapi-stubs/py.typed b/python/psapi-stubs/py.typed
deleted file mode 100644
index e69de29..0000000
diff --git a/setup.py b/setup.py
index b76aaf3..a7fe0f3 100644
--- a/setup.py
+++ b/setup.py
@@ -4,6 +4,7 @@
 import re
 import subprocess
 import sys
+import shutil
 from pathlib import Path
 from glob import glob
 
@@ -144,6 +145,21 @@ def build_extension(self, ext: CMakeExtension) -> None:
         )
 
 
+def move_stubs_to_root() -> None:
+    shutil.move('python/psapi-stubs', 'psapi-stubs')
+    os.rmdir('python')
+
+
+move_stubs_to_root()
+
+
+def package_files(directory):
+    paths = []
+    for (path, directories, filenames) in os.walk(directory):
+        for filename in filenames:
+            paths.append(os.path.join('..', path, filename))
+    return paths
+
 
 setup(
     name="PhotoshopAPI",
@@ -153,8 +169,8 @@ def build_extension(self, ext: CMakeExtension) -> None:
     long_description="Includes full support for modifying nested layer hierarchies as well as all bit depths known to Photoshop",
     ext_modules=[CMakeExtension("psapi")],
     cmdclass={"build_ext": CMakeBuild},
-    packages=["python/psapi-stubs"],
-    package_data={"python/psapi-stubs": ["*.pyi", "py.typed"]},
+    packages=["psapi-stubs"],
+    package_data={"psapi-stubs": package_files("psapi-stubs")},
     zip_safe=False,
     install_requires= [
         "numpy>=1.26"