Skip to content

Commit 370b695

Browse files
authored
Merge pull request #14 from effigies/mnt/declarative
MNT: Move back to declarative package finding
2 parents 3b17036 + 6d5e1c9 commit 370b695

File tree

2 files changed

+8
-12
lines changed

2 files changed

+8
-12
lines changed

setup.cfg

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,12 @@ description = TODO
1010
python_requires = >=3.7
1111
install_requires =
1212
pydra >= 0.6.2
13+
packages = find_namespace:
1314

14-
test_requires =
15-
pytest >= 4.4.0
16-
pytest-cov
17-
pytest-env
18-
pytest-xdist
19-
pytest-rerunfailures
20-
codecov
15+
[options.packages.find]
16+
include =
17+
pydra.tasks.%(subpackage)s
18+
pydra.tasks.%(subpackage)s.*
2119

2220
[options.extras_require]
2321
doc =

setup.py

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

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

77
SUBPACKAGE = "TODO"
88

99
# Give setuptools a hint to complain if it's too old a version
1010
# 30.3.0 allows us to put most metadata in setup.cfg
11+
# 40.1.0 enables the `find_namespace:` directive
1112
# Should match pyproject.toml
12-
SETUP_REQUIRES = ["setuptools >= 30.3.0"]
13+
SETUP_REQUIRES = ["setuptools >= 40.1.0"]
1314
# This enables setuptools to install wheel on-the-fly
1415
SETUP_REQUIRES += ["wheel"] if "bdist_wheel" in sys.argv else []
1516

@@ -19,7 +20,4 @@
1920
setup_requires=SETUP_REQUIRES,
2021
version=versioneer.get_version(),
2122
cmdclass=versioneer.get_cmdclass(),
22-
packages=find_namespace_packages(
23-
include=(f"pydra.tasks.{SUBPACKAGE}", f"pydra.tasks.{SUBPACKAGE}.*")
24-
),
2523
)

0 commit comments

Comments
 (0)