Version 0.0.2

Fix PyPI packaging problems breaking installation of config files.

HISTORY.rst

@@ -2,6 +2,12 @@
 History
 =======
 
+0.0.2 (2017-05-22)
+------------------
+
+* Attempt to fix PyPI configuration file packaging.
+
+
 0.0.1 (2017-05-22)
 ------------------
 

MANIFEST.in

@@ -13,6 +13,6 @@ recursive-exclude * *.py[co]
 recursive-include docs *.rst conf.py Makefile make.bat *.jpg *.png *.gif
 
 recursive-include diluvian *.py *.txt
+recursive-include diluvian/conf *.toml
 include requirements.txt
 recursive-include requirements *.txt
-include conf/default.toml conf/cremi_datasets.toml conf/cremi_test_datasets.toml

diluvian/__init__.py

@@ -2,4 +2,4 @@
 
 __author__ = """Andrew S. Champion"""
 __email__ = '[email protected]'
-__version__ = '0.0.1'
+__version__ = '0.0.2'

diluvian/__main__.py

@@ -29,14 +29,14 @@ def _make_main_parser():
 
     common_parser.add_argument(
             '-c', '--config-file', action='append', dest='config_files', default=[],
-            help='Configuration files to use. For defaults, see `conf/default.toml`. '
+            help='Configuration files to use. For defaults, see `diluvian/conf/default.toml`. '
                  'Values are overwritten in the order provided.')
     common_parser.add_argument(
             '-m', '--model-file', dest='model_file', default=None,
             help='Existing network model file to use for prediction or continued training.')
     common_parser.add_argument(
             '-v', '--volume-file', action='append', dest='volume_files', default=[],
-            help='Volume configuration files. For example, see `conf/cremi_datasets.toml`.'
+            help='Volume configuration files. For example, see `diluvian/conf/cremi_datasets.toml`.'
                  'Values are overwritten in the order provided.')
     common_parser.add_argument(
             '--no-in-memory', action='store_false', dest='in_memory', default=True,
@@ -272,7 +272,7 @@ def load_volumes(volume_files, in_memory, name_regex=None):
         for volume_file in volume_files:
             volumes.update(HDF5Volume.from_toml(volume_file))
     else:
-        volumes = HDF5Volume.from_toml(os.path.join(os.path.dirname(__file__), '..', 'conf', 'cremi_datasets.toml'))
+        volumes = HDF5Volume.from_toml(os.path.join(os.path.dirname(__file__), 'conf', 'cremi_datasets.toml'))
 
     if name_regex is not None:
         name_regex = re.compile(name_regex)

diluvian/config.py

@@ -318,4 +318,4 @@ def to_toml(self, filename):
 
 
 CONFIG = Config()
-CONFIG.from_toml(os.path.join(os.path.dirname(__file__), '..', 'conf', 'default.toml'))
+CONFIG.from_toml(os.path.join(os.path.dirname(__file__), 'conf', 'default.toml'))

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.0.1
+current_version = 0.0.2
 commit = True
 tag = True
 

setup.py

@@ -31,7 +31,7 @@
 
 setup(
     name='diluvian',
-    version='0.0.1',
+    version='0.0.2',
     description="Flood filling networks for segmenting electron microscopy of neural tissue.",
     long_description=readme + '\n\n' + history,
     author="Andrew S. Champion",