Moved configuration files inside nmrstarlib package.

MoseleyBioinformaticsLab · Aug 10, 2016 · 97536d3 · 97536d3
1 parent 8ae9b62
commit 97536d3
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/nmrstarlib/__init__.py b/nmrstarlib/__init__.py
@@ -33,11 +33,11 @@
 this_directory = os.path.dirname(__file__)
 
 if nmrstarlib.NMRSTAR_VERSION == "3":
-    config_filepath = os.path.join(this_directory, '../conf/constants_nmrstar3.json')
+    config_filepath = os.path.join(this_directory, 'conf/constants_nmrstar3.json')
 elif nmrstarlib.NMRSTAR_VERSION == "2":
-    config_filepath = os.path.join(this_directory, '../conf/constants_nmrstar2.json')
+    config_filepath = os.path.join(this_directory, 'conf/constants_nmrstar2.json')
 else:
-    config_filepath = os.path.join(this_directory, '../conf/constants_nmrstar3.json')
+    config_filepath = os.path.join(this_directory, 'conf/constants_nmrstar3.json')
 
 with open(config_filepath, "r") as infile:
     nmrstarlib.update_constants(infile)
diff --git a/conf/constants_nmrstar2.json → nmrstarlib/conf/constants_nmrstar2.json b/conf/constants_nmrstar2.json → nmrstarlib/conf/constants_nmrstar2.json
diff --git a/conf/constants_nmrstar3.json → nmrstarlib/conf/constants_nmrstar3.json b/conf/constants_nmrstar3.json → nmrstarlib/conf/constants_nmrstar3.json
diff --git a/setup.py b/setup.py
@@ -4,19 +4,19 @@
 
 setup(
     name='nmrstarlib',
-    version='1.0.0',
+    version='1.0.2',
     author='Andrey Smelter',
     author_email='andrey.smelter@gmail.com',
     description='Python library for parsing data from NMR-STAR format files',
     keywords='BMRB NMR-STAR parsing nmrstarlib',
     license='MIT',
-    url='', # link pointing to github repo
+    url='https://github.com/MoseleyBioinformaticsLab/nmrstarlib',
     packages=find_packages(),
+    package_data={'nmrstarlib':['conf/*.json']},
     platforms='any',
-    long_description=open('README.rst').read(),
-    data_files=[('', ['LICENSE', 'README.rst']), ('conf', ['conf/constants_nmrstar2.json', 'conf/constants_nmrstar3.json'])],
+    long_description=open('READMEPYPI.rst').read(),
     classifiers=[
-        'Development Status :: 1.0.0',
+        'Development Status :: 4 - Beta',
         'Environment :: Console',
         'Intended Audience :: Developers',
         'Intended Audience :: Science/Research',
@@ -25,7 +25,7 @@
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
-        'Topic :: Scientific/Engineering :: NMR-STAR Data Parsing',
+        'Topic :: Scientific/Engineering :: Bio-Informatics',
         'Topic :: Software Development :: Libraries :: Python Modules',
     ],
 )