Skip to content

Commit 8dd3a21

Browse files
committed
FIX: Find packages correctly
1 parent e68a620 commit 8dd3a21

File tree

2 files changed

+15
-9
lines changed

2 files changed

+15
-9
lines changed

setup.cfg

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ python_requires = >=3.7
1111
install_requires =
1212
pydra >= 0.14.1
1313

14-
packages = pydra.tasks.%(subpackage)s
15-
1614
[options.extras_require]
1715
doc =
1816
packaging

setup.py

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,26 @@
11
#!/usr/bin/env python
22
import sys
33

4-
from setuptools import setup
4+
from setuptools import setup, find_packages
55
import versioneer
66

7+
SUBPACKAGE = "fsl"
8+
79
# Give setuptools a hint to complain if it's too old a version
810
# 30.3.0 allows us to put most metadata in setup.cfg
911
# Should match pyproject.toml
10-
SETUP_REQUIRES = ['setuptools >= 30.3.0']
12+
SETUP_REQUIRES = ["setuptools >= 30.3.0"]
1113
# This enables setuptools to install wheel on-the-fly
12-
SETUP_REQUIRES += ['wheel'] if 'bdist_wheel' in sys.argv else []
14+
SETUP_REQUIRES += ["wheel"] if "bdist_wheel" in sys.argv else []
1315

1416
if __name__ == "__main__":
15-
setup(name='pydra-fsl',
16-
setup_requires=SETUP_REQUIRES,
17-
version=versioneer.get_version(),
18-
cmdclass=versioneer.get_cmdclass())
17+
setup(
18+
name=f"pydra-{SUBPACKAGE}",
19+
setup_requires=SETUP_REQUIRES,
20+
version=versioneer.get_version(),
21+
cmdclass=versioneer.get_cmdclass(),
22+
packages=[
23+
f"pydra.tasks.{SUBPACKAGE}.{package}"
24+
for package in find_packages("pydra/tasks/{SUBPACKAGE}")
25+
],
26+
)

0 commit comments

Comments
 (0)