Use package_data instead of data_files. Fixes devexp-db#66 and devexp…

…-db#69

MANIFEST.in

@@ -5,8 +5,6 @@ include LICENSE
 include Makefile
 include NEWS
 include tests/testsuite
-include distconf/lib/*.yaml
-include distconf/*.yaml
 include docs/*.rst
 include docs/conf.py
 include docs/Makefile

Makefile

@@ -7,7 +7,7 @@ test-end2end:
 	@cd tests/ && PYTHON=${PYTHON} ./testsuite
 
 test-unit:
-	DG_DISTCONFDIR=./distconf PYTHONPATH=..:$${PYTHONPATH} ${PYTHON} -m pytest `[ ! -z ${COVERAGE} ] && echo "--cov distgen"` tests/unittests/
+	PYTHONPATH=..:$${PYTHONPATH} ${PYTHON} -m pytest `[ ! -z ${COVERAGE} ] && echo "--cov distgen"` tests/unittests/
 
 test-lint:
 	flake8 distgen/

dg

@@ -5,7 +5,4 @@ proj_cli_dir="$(dirname "$(readlink -f "$0")")"
 export PYTHON=${PYTHON:-`which python2`}
 export PYTHONPATH="$proj_cli_dir${PYTHONPATH+:$PYTHONPATH}"
 
-export DG_TPLDIR="$proj_cli_dir/templates"
-export DG_DISTCONFDIR="$proj_cli_dir/distconf"
-
 $PYTHON $proj_cli_dir/bin/dg "$@"

distgen/generator.py

@@ -19,13 +19,16 @@ class Generator(object):
     pm_spc = None
 
     def __init__(self, global_jinja_args=None):
+        here = os.path.dirname(os.path.abspath(__file__))
         self.pm_cfg = PathManager(
-            [os.path.join(sys.prefix, "share", "distgen", "distconf")],
+            [os.path.join(here, "distconf"),
+             os.path.join(sys.prefix, "share", "distgen", "distconf")],
             envvar="DG_DISTCONFDIR"
         )
 
         self.pm_tpl = PathManager(
-            [os.path.join(sys.prefix, "share", "distgen", "templates")],
+            [os.path.join(here, "templates"),
+             os.path.join(sys.prefix, "share", "distgen", "templates")],
             envvar="DG_TPLDIR"
         )
 

rpm/distgen.spec.dg

@@ -36,6 +36,8 @@ file and preexisting distribution metadata generate output file.
 
 %install
 %{pybin} setup.py install --root=%{buildroot}
+mkdir -p %{buildroot}%{_datadir}/distgen
+mv %{buildroot}%{pylib}/distgen/{distconf,templates} %{buildroot}%{_datadir}/distgen
 
 
 %check

setup.py

@@ -24,17 +24,6 @@
     raise
 
 
-def dynamic_data_files():
-    dynamic_list = []
-    for dcdir in ["distconf", "distconf/lib"]:
-        dcfiles = ["{0}/{1}".format(dcdir, f)
-                   for f in listdir(dcdir)]
-        dcfiles = [f for f in dcfiles if path.isfile(f)]
-        dynamic_list.append((pkgdatadir + "/" + dcdir, dcfiles))
-
-    return dynamic_list
-
-
 def get_requirements():
     with open('requirements.txt') as f:
         return f.read().splitlines()
@@ -52,17 +41,11 @@ def get_requirements():
     url='https://github.com/devexp-db/distgen',
     platforms=['any'],
     packages=['distgen'],
-    data_files=[
-        (tpldir + '/container/docker', [
-            'templates/container/docker/parts.tpl',
-        ]),
-        (tpldir, [
-            'templates/docker.tpl',
-            'templates/makefile-macros.tpl',
-            'templates/README',
-            'templates/general.tpl',
-        ]),
-    ] + dynamic_data_files(),
+    # this is bit impractical, but I see no better way to include subdirs properly
+    package_data={'distgen':
+                  ['distconf/*.yaml', 'distconf/**/*.yaml',
+                   'templates/*.tpl', 'templates/**/*.tpl', 'templates/**/**/*.tpl']
+                 },
     scripts=['bin/dg'],
     install_requires=get_requirements(),
     cmdclass={