From 33f80125270d1500b1f712c0091a1cf92157052a Mon Sep 17 00:00:00 2001
From: frjcomp <frj1@securelogon.ch>
Date: Tue, 5 Mar 2024 16:04:37 +0100
Subject: [PATCH] retry packaging

---
 MANIFEST.in                                    | 1 +
 setup.py                                       | 5 +++--
 {conkeyscan => src/conkeyscan}/__init__.py     | 0
 src/conkeyscan/config/__init__.py              | 0
 {conkeyscan => src/conkeyscan}/config/dict.txt | 0
 {conkeyscan => src/conkeyscan}/conkeyscan.py   | 0
 6 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 MANIFEST.in
 rename {conkeyscan => src/conkeyscan}/__init__.py (100%)
 create mode 100644 src/conkeyscan/config/__init__.py
 rename {conkeyscan => src/conkeyscan}/config/dict.txt (100%)
 rename {conkeyscan => src/conkeyscan}/conkeyscan.py (100%)

diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..b80e182
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1 @@
+include src/conkeyscan/config/*.txt
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 6f6e902..19082c5 100644
--- a/setup.py
+++ b/setup.py
@@ -3,6 +3,7 @@
 setup(
     name="conkeyscan",
     author="Jan Friedli",
+    url="https://github.com/CompassSecurity/conkeyscan",
     description="A Pentesters Confluence Keyword Scanner",
     version="{{VERSION_PLACEHOLDER}}",
     long_description=open("README.md").read(),
@@ -21,7 +22,7 @@
     entry_points={
         "console_scripts": ["conkeyscan = conkeyscan.conkeyscan:entry_point"]
     },
-    packages=find_packages(),
+    packages=find_packages(where="src"),
+    package_dir={"": "src"},
     include_package_data=True,
-    package_data={"conkeyscan.config": ["*.txt"]},
 )
diff --git a/conkeyscan/__init__.py b/src/conkeyscan/__init__.py
similarity index 100%
rename from conkeyscan/__init__.py
rename to src/conkeyscan/__init__.py
diff --git a/src/conkeyscan/config/__init__.py b/src/conkeyscan/config/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/conkeyscan/config/dict.txt b/src/conkeyscan/config/dict.txt
similarity index 100%
rename from conkeyscan/config/dict.txt
rename to src/conkeyscan/config/dict.txt
diff --git a/conkeyscan/conkeyscan.py b/src/conkeyscan/conkeyscan.py
similarity index 100%
rename from conkeyscan/conkeyscan.py
rename to src/conkeyscan/conkeyscan.py