Skip to content

Commit e865c6c

Browse files
authored
[FIX] Fix packaging of resources (#428)
* Use data_files correctly. * Try using setup.cfg. * Maybe recursive? * Just do it the lazy way... * Remove files from within package from MANIFEST.in. According to https://gist.github.com/effigies/9bbb424535d6a1d838d6325191c0a736 MANIFEST should only include files outside of the package folder.
1 parent 883e012 commit e865c6c

3 files changed

Lines changed: 8 additions & 10 deletions

File tree

MANIFEST.in

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1 @@
1-
recursive-include nimare/resources *
2-
recursive-include nimare/tests/data *
31
include versioneer.py
4-
include nimare/_version.py

setup.cfg

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,11 @@ exclude = *build/,info.py,_version.py,due.py
1515
putty-ignore =
1616
*/__init__.py : +F401
1717
ignore = E203,E402,E722,W503
18+
19+
[options.package_data]
20+
* =
21+
resources/*
22+
resources/atlases/*
23+
resources/templates/*
24+
tests/data/*
25+
tests/data/cognitive_atlas/*

setup.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,6 @@ def main():
1818
exec(f.read())
1919
vars = locals()
2020

21-
# Collect resource files
22-
data_folders = ["nimare/resources", "nimare/tests/data"]
23-
data_files = [glob(op.join(d, "**"), recursive=True) for d in data_folders]
24-
data_files = [item for sublist in data_files for item in sublist]
25-
data_files = [f for f in data_files if op.isfile(f)]
26-
2721
root_dir = op.dirname(op.abspath(getfile(currentframe())))
2822
cmdclass = versioneer.get_cmdclass()
2923

@@ -46,7 +40,6 @@ def main():
4640
extras_require=vars["EXTRA_REQUIRES"],
4741
entry_points=vars["ENTRY_POINTS"],
4842
packages=find_packages(exclude=("tests",)),
49-
data_files=data_files,
5043
zip_safe=False,
5144
cmdclass=cmdclass,
5245
)

0 commit comments

Comments
 (0)