Merge pull request #6 from effigies/fix/packaging

FIX: Find packages correctly

Author: djarecka

setup.cfg

@@ -11,8 +11,6 @@ python_requires = >=3.7
 install_requires =
     pydra >= 0.14.1
 
-packages = pydra.tasks.%(subpackage)s
-
 [options.extras_require]
 doc =
     packaging

setup.py

@@ -1,18 +1,25 @@
 #!/usr/bin/env python
 import sys
 
-from setuptools import setup
+from setuptools import setup, find_namespace_packages
 import versioneer
 
+SUBPACKAGE = "fsl"
+
 # Give setuptools a hint to complain if it's too old a version
 # 30.3.0 allows us to put most metadata in setup.cfg
 # Should match pyproject.toml
-SETUP_REQUIRES = ['setuptools >= 30.3.0']
+SETUP_REQUIRES = ["setuptools >= 30.3.0"]
 # This enables setuptools to install wheel on-the-fly
-SETUP_REQUIRES += ['wheel'] if 'bdist_wheel' in sys.argv else []
+SETUP_REQUIRES += ["wheel"] if "bdist_wheel" in sys.argv else []
 
 if __name__ == "__main__":
-    setup(name='pydra-fsl',
-          setup_requires=SETUP_REQUIRES,
-          version=versioneer.get_version(),
-          cmdclass=versioneer.get_cmdclass())
+    setup(
+        name=f"pydra-{SUBPACKAGE}",
+        setup_requires=SETUP_REQUIRES,
+        version=versioneer.get_version(),
+        cmdclass=versioneer.get_cmdclass(),
+        packages=find_namespace_packages(
+            include=(f"pydra.tasks.{SUBPACKAGE}", f"pydra.tasks.{SUBPACKAGE}.*")
+        ),
+    )