Skip to content

Commit

Permalink
Removing data_files and adding package_data
Browse files Browse the repository at this point in the history
  • Loading branch information
kadrlica committed Jun 30, 2016
1 parent b8987fd commit 4cc3a43
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 5 deletions.
1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
include versioneer.py
include dmsky/_version.py
include requirements.txt
recursive-include dmsky/data *.yaml
27 changes: 22 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,27 @@
DESC = "Dark matter skymaps."
LONG_DESC = "See %s"%URL

def find_data():
def find_data_files(datadir=None):
"""
http://stackoverflow.com/a/13629066/4075339
"""
# Copy the data files
datadir = os.path.join('dmsky','data')
datafiles = [(d, [os.path.join(d,f) for f in files])
if not datadir: datadir = os.path.join(NAME,'data')
data_files = [(d, [os.path.join(d,f) for f in files])
for d, folders, files in os.walk(datadir)]
return datafiles
return data_files

def find_package_data(datadir=None):
"""
http://stackoverflow.com/a/36693250/4075339
"""
if not datadir: datadir = os.path.join(NAME,'data')
paths = []
for (d, folders, files) in os.walk(datadir):
for f in files:
paths.append(os.path.join('..', d, f))
package_data = {'':paths}
return package_data

setup(
name=NAME,
Expand All @@ -47,7 +62,9 @@ def find_data():
'pymodeler >= 0.1.0',
],
packages=find_packages(),
data_files=find_data(),
#data_files=find_data_files(),
package_data=find_package_data(),
include_package_data=True,
description=DESC,
long_description=LONG_DESC,
platforms='any',
Expand Down

0 comments on commit 4cc3a43

Please sign in to comment.