Move config files inside source tree

pydmrs/simplification/gpred_filtering.py

@@ -11,7 +11,7 @@
 if __name__ == '__main__':
     parser = argparse.ArgumentParser(description='DMRS simplification tool')
     parser.add_argument('-c', '--config', default=None,
-                        help='Path to simplifaction configuration file. By default, configuration in configs/default_simplification.conf is used.')
+                        help='Path to simplifaction configuration file. By default, configuration in __config__/default_simplification.conf is used.')
     parser.add_argument('input_dmrs', help='Specify input DMRS file')
     parser.add_argument('output_dmrs', help='Specify output dmrs file.')
     args = parser.parse_args()

pydmrs/utils.py

@@ -2,7 +2,7 @@
 from configparser import ConfigParser, NoSectionError, NoOptionError
 import pydmrs
 
-CONFIG_DIR = os.path.normpath(os.path.join(pydmrs.__file__, '../../configs'))
+CONFIG_DIR = os.path.normpath(os.path.join(pydmrs.__file__, '../__config__'))
 
 def get_config_option(config, section, option, opt_type=None, default=None):
     """
@@ -57,7 +57,7 @@ def parse_config(config_string):
 def load_config(filename, default=True):
     """
     Load a default config file
-    :param filename: name of the file (in the configs directory)
+    :param filename: name of the file (in the config directory)
     :param default: if True, append filename to default config directory
     """
     config = ConfigParser()

setup.py

@@ -1,7 +1,7 @@
 import os
 from setuptools import setup, find_packages
 
-VERSION = '1.0.4'
+VERSION = '1.0.5'
 
 setup(
   name = 'pydmrs',
@@ -13,8 +13,8 @@
   url = 'https://github.com/delph-in/pydmrs',
   download_url = 'https://github.com/delph-in/pydmrs/tarball/'+VERSION,
   keywords = ['NLP', 'Natural Language Processing', 'Computational Linguistics', 'Semantics'],
-  packages = find_packages().append('examples'),
-  data_files = [('configs', ['configs/'+filename for filename in os.listdir('configs')])],
+  packages = find_packages(),
+  package_data = {'pydmrs': ['__config__/*.conf']},
   install_requires = [
     'pydelphin'
   ]