Merge pull request #58 from materials-data-facility/toolbox-dev

Remove relative imports, fix ALCF Data Portal issue

mdf_toolbox/__init__.py

@@ -1,11 +1,14 @@
 # F401: Imported but unused
-from .auth import anonymous_login, confidential_login, login, logout  # noqa: F401
-from .filesystem import posixify_path, uncompress_tree  # noqa: F401
-from .globus_search.utils import format_gmeta, gmeta_pop, translate_index  # noqa: F401
-from .globus_search.search_helper import SearchHelper  # noqa: F401
-from .globus_search.sub_helpers import AggregateHelper  # noqa: F401
-from .globus_transfer import custom_transfer, globus_check_directory, quick_transfer  # noqa: F401
-from .json_dict import (dict_merge, flatten_json, insensitive_comparison,  # noqa: F401
-                        prettify_json, translate_json)  # noqa: F401
-from .jsonschema import condense_jsonschema, expand_jsonschema, prettify_jsonschema  # noqa: F401
-from .version import __version__   # noqa: F401
+from mdf_toolbox import globus_search  # noqa: F401
+from mdf_toolbox.auth import anonymous_login, confidential_login, login, logout  # noqa: F401
+from mdf_toolbox.filesystem import posixify_path, uncompress_tree  # noqa: F401
+from mdf_toolbox.globus_search.utils import format_gmeta, gmeta_pop, translate_index  # noqa: F401
+from mdf_toolbox.globus_search.search_helper import SearchHelper  # noqa: F401
+from mdf_toolbox.globus_search.sub_helpers import AggregateHelper  # noqa: F401
+from mdf_toolbox.globus_transfer import (custom_transfer, globus_check_directory,  # noqa: F401
+                                         quick_transfer)  # noqa: F401
+from mdf_toolbox.json_dict import (dict_merge, flatten_json, insensitive_comparison,  # noqa: F401
+                                   prettify_json, translate_json)  # noqa: F401
+from mdf_toolbox.jsonschema import (condense_jsonschema, expand_jsonschema,  # noqa: F401
+                                    prettify_jsonschema)  # noqa: F401
+from mdf_toolbox.version import __version__   # noqa: F401

mdf_toolbox/globus_search/sub_helpers.py

@@ -1,6 +1,6 @@
 import warnings
 
-from .search_helper import SearchHelper, SEARCH_LIMIT
+from mdf_toolbox.globus_search.search_helper import SearchHelper, SEARCH_LIMIT
 
 
 class AggregateHelper(SearchHelper):

mdf_toolbox/globus_transfer.py

@@ -5,7 +5,7 @@
 
 import globus_sdk
 
-from .filesystem import posixify_path
+from mdf_toolbox.filesystem import posixify_path
 
 
 # *************************************************

mdf_toolbox/jsonschema.py

@@ -3,7 +3,7 @@
 
 import jsonschema
 
-from .json_dict import dict_merge, flatten_json
+from mdf_toolbox.json_dict import dict_merge, flatten_json
 
 
 # *************************************************

mdf_toolbox/version.py

@@ -1,2 +1,2 @@
 # Single source of truth for package version
-__version__ = "0.5.5"
+__version__ = "0.5.6"

setup.py

@@ -1,5 +1,5 @@
 import os
-from setuptools import setup
+from setuptools import setup, find_packages
 
 # Single source of truth for version
 version_ns = {}
@@ -10,7 +10,7 @@
 setup(
     name='mdf_toolbox',
     version=version,
-    packages=['mdf_toolbox'],
+    packages=find_packages(),
     description='Materials Data Facility Python utilities',
     long_description=("Toolbox is the Materials Data Facility Python package"
                       " containing utility functions and other tools."),