From cd6eebd85d32feb289ccecd1aee45fb40b03d77f Mon Sep 17 00:00:00 2001
From: Frederick Muriuki Muriithi
Date: Sat, 2 Mar 2024 15:50:11 +0300
Subject: Use `find_packages()` and include static files and templates.

---
 MANIFEST.in |  2 ++
 setup.py    | 19 +++++++++----------
 2 files changed, 11 insertions(+), 10 deletions(-)
 create mode 100644 MANIFEST.in

diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..ea5197f
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,2 @@
+global-include static/**/*.js static/**/*.css templates/**/*.html
+global-exclude *~ *.py[cod]
\ No newline at end of file
diff --git a/setup.py b/setup.py
index acf5fee..10848df 100755
--- a/setup.py
+++ b/setup.py
@@ -2,22 +2,14 @@
 """Setup script for GeneNetwork Auth package."""
 import glob
 from pathlib import Path
-from setuptools import setup
 from setup_commands import RunTests
+from setuptools import setup, find_packages
 
 LONG_DESCRIPTION = """
 gn-auth project is the authentication/authorisation server to be used
 across all GeneNetwork services.
 """
 
-def get_packages(dir_path):
-    "get package relative to name of directory"
-    dir_name = Path(dir_path).absolute().name
-    return list(".".join(path) for path in
-                (path[0:-1] for path in
-                 (path.split("/") for path in
-                  glob.glob(f"{dir_name}/**/__init__.py", recursive=True))))
-
 setup(author="Frederick M. Muriithi",
       author_email="fredmanglis@gmail.com",
       description=(
@@ -37,12 +29,19 @@ setup(author="Frederick M. Muriithi",
           "xapian-bindings"
       ],
       include_package_data=True,
+      packages=find_packages(
+          where=".",
+          exclude=(
+              "tests",
+              "tests.*",
+              "setup_commands",
+              "setup_commands.*")),
+      # `package_data` doesn't seem to work. Use MANIFEST.in instead
       scripts=[],
       license="AGPLV3",
       long_description=LONG_DESCRIPTION,
       long_description_content_type="text/markdown",
       name="gn-auth",
-      packages = get_packages("./gn_auth") + get_packages("./migrations"),
       url="https://github.com/genenetwork/gn-auth",
       version="0.0.1",
       tests_require=["pytest", "hypothesis"],
-- 
cgit v1.2.3