Move to src layout for better tests isolation

markreidvfx · Jul 3, 2022 · b127b12 · b127b12
1 parent da87779
commit b127b12
Show file tree

Hide file tree

Showing 16 changed files with 6 additions and 7 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,3 +1,3 @@
 include README.rst LICENSE
-include avb/*.pyx
-include avb/*.cpp
+include src/avb/*.pyx
+include src/avb/*.cpp
diff --git a/setup.py b/setup.py
@@ -19,7 +19,7 @@
 """
 
 sourcefiles = [
-"avb/_ext.pyx",
+"src/avb/_ext.pyx",
 ]
 
 extensions =[]
@@ -43,7 +43,7 @@ def run(self):
             return
 
         target_file = os.path.join(self.build_lib, 'avb', "__init__.py")
-        source_file = os.path.join(os.path.dirname(__file__), 'avb', "__init__.py")
+        source_file = os.path.join(os.path.dirname(__file__), 'src', 'avb', "__init__.py")
 
         # get the base data from the original file
         with open(source_file, 'r') as fi:
@@ -91,9 +91,8 @@ def run(self):
 
     platforms='any',
 
-    packages=[
-        'avb',
-    ],
+    packages=['avb'],
+    package_dir={'': 'src'},
 
     cmdclass={'build_py': AddMetadata},
     ext_modules = extensions,

diff --git a/avb/__init__.py → src/avb/__init__.py b/avb/__init__.py → src/avb/__init__.py
diff --git a/avb/_ext.pyx → src/avb/_ext.pyx b/avb/_ext.pyx → src/avb/_ext.pyx
diff --git a/avb/_ext_core.cpp → src/avb/_ext_core.cpp b/avb/_ext_core.cpp → src/avb/_ext_core.cpp
diff --git a/avb/attributes.py → src/avb/attributes.py b/avb/attributes.py → src/avb/attributes.py
diff --git a/avb/bin.py → src/avb/bin.py b/avb/bin.py → src/avb/bin.py
diff --git a/avb/components.py → src/avb/components.py b/avb/components.py → src/avb/components.py
diff --git a/avb/core.py → src/avb/core.py b/avb/core.py → src/avb/core.py
diff --git a/avb/essence.py → src/avb/essence.py b/avb/essence.py → src/avb/essence.py
diff --git a/avb/file.py → src/avb/file.py b/avb/file.py → src/avb/file.py
diff --git a/avb/ioctx.py → src/avb/ioctx.py b/avb/ioctx.py → src/avb/ioctx.py
diff --git a/avb/misc.py → src/avb/misc.py b/avb/misc.py → src/avb/misc.py
diff --git a/avb/mobid.py → src/avb/mobid.py b/avb/mobid.py → src/avb/mobid.py
diff --git a/avb/trackgroups.py → src/avb/trackgroups.py b/avb/trackgroups.py → src/avb/trackgroups.py
diff --git a/avb/utils.py → src/avb/utils.py b/avb/utils.py → src/avb/utils.py