Merge branch 'develop'

gazelib/__init__.py

@@ -2,10 +2,12 @@
 '''
 Gazelib, a toolkit for gaze analysis.
 '''
-from gazelib.package import version as __version__  # noqa
-import gazelib.containers  # noqa
-import gazelib.io  # noqa
-import gazelib.legacy  # noqa
-import gazelib.settings  # noqa
-import gazelib.statistics  # noqa
-import gazelib.validation  # noqa
+from . import package
+__version__ = package.version  # noqa
+
+from . import containers  # noqa
+from . import io  # noqa
+from . import legacy  # noqa
+# import gazelib.settings  # noqa
+from . import statistics  # noqa
+# import gazelib.validation  # noqa

gazelib/containers.py

@@ -2,11 +2,10 @@
 '''
 Classes that store the gaze data and can be fed to analysis functions.
 '''
-from gazelib.validation import is_list_of_strings, is_real
-from gazelib.settings import min_event_slice_overlap_seconds as min_overlap
-from gazelib.statistics import arithmetic_mean, deltas
-from gazelib.io import (load_json, write_json, write_fancy_json,
-                        write_dictlist_as_csv)
+from .validation import is_list_of_strings, is_real
+from .settings import min_event_slice_overlap_seconds as min_overlap
+from .statistics import arithmetic_mean, deltas
+from .io import load_json, write_json, write_fancy_json, write_dictlist_as_csv
 from time import time as get_current_posix_time
 from deepdiff import DeepDiff
 from bisect import bisect_left  # binary tree search tool

gazelib/legacy/__init__.py

@@ -1,4 +1,4 @@
 '''
 Tools from the previous igazelib project
 '''
-import gazelib.legacy.igazelib  # noqa
+from . import igazelib  # noqa