Fixed location of configs

diskontinuum · Aug 12, 2016 · 8d8de2c · 8d8de2c
1 parent 25f43ec
commit 8d8de2c
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 5 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1 +1 @@
-include config/*
+
diff --git a/config/config_cellpainting.ini → perturbation/config/config_cellpainting.ini b/config/config_cellpainting.ini → perturbation/config/config_cellpainting.ini
diff --git a/config/config_htqc.ini → perturbation/config/config_htqc.ini b/config/config_htqc.ini → perturbation/config/config_htqc.ini
diff --git a/config/logging_config.json → perturbation/config/logging_config.json b/config/logging_config.json → perturbation/config/logging_config.json
diff --git a/perturbation/ingest.py b/perturbation/ingest.py
@@ -101,9 +101,9 @@ def seed(config, input, output):
                 into(csv_filename=pattern_csv, output=output, table_name=pattern, table_number=table_number)
 
 
-config_file_sys = pkg_resources.resource_filename(pkg_resources.Requirement.parse("perturbation"), "config/config_htqc.ini")
-logging_config_file_sys = pkg_resources.resource_filename(pkg_resources.Requirement.parse("perturbation"), "config/logging_config.json")
-
+config_file_sys = pkg_resources.resource_filename(__name__, "config/config_htqc.ini")
+logging_config_file_sys = pkg_resources.resource_filename(__name__, "config/logging_config.json")
+munge_file = pkg_resources.resource_filename(__name__, "scripts/munge.sh")
 @click.command()
 @click.argument('input', type=click.Path(dir_okay=True, exists=True, readable=True))
 @click.help_option(help='')
@@ -138,7 +138,7 @@ def main(configfile, input, loggingconfigfile, output, verbose, skipmunge):
 
     if not skipmunge:
         logger.debug('Calling munge')
-        subprocess.call([pkg_resources.resource_filename(pkg_resources.Requirement.parse("perturbation"), "munge.sh"), input])
+        subprocess.call([munge_file, input])
         logger.debug('Completed munge')
     else:
         logger.debug('Skipping munge')

diff --git a/munge.sh → perturbation/scripts/munge.sh b/munge.sh → perturbation/scripts/munge.sh
diff --git a/setup.py b/setup.py
@@ -36,6 +36,9 @@ def run_tests(self):
     cmdclass={
         'test': Test
     },
+    package_data={
+        'perturbation' :['config/*.ini', 'scripts/*.sh'],
+    },
     packages=setuptools.find_packages(
         exclude=[
             'test'