Improve importing workflow + dist bug fix

recordlinkage/__init__.py

@@ -1,11 +1,15 @@
 
-from .indexing import *
-from .comparing import *
-from .classifiers import *
-from .measures import *
+from recordlinkage.indexing import *
+from recordlinkage.comparing import *
+from recordlinkage.classifiers import *
+from recordlinkage.measures import *
 
-from ._version import get_versions
+# # import standardise
+# from recordlinkage.standardise.cleaning import *
+# from recordlinkage.standardise.encoding import *
+
+from recordlinkage._version import get_versions
 __version__ = get_versions()['version']
 del get_versions
 
-__all__ = ['standardise.cleaning', 'standardise.phonetic', 'datasets']
+__all__ = ['datasets']

recordlinkage/comparing.py

@@ -11,9 +11,13 @@
 from recordlinkage.algorithms.distance import _1d_distance, _haversine_distance
 from recordlinkage.algorithms.numeric import _step_sim, \
     _linear_sim, _squared_sim, _exp_sim, _gauss_sim
-from recordlinkage.algorithms.string import jaro_similarity, \
-    jarowinkler_similarity, levenshtein_similarity, \
-    damerau_levenshtein_similarity, qgram_similarity, cosine_similarity
+from recordlinkage.algorithms.string import \
+    jaro_similarity, \
+    jarowinkler_similarity, \
+    levenshtein_similarity, \
+    damerau_levenshtein_similarity, \
+    qgram_similarity, \
+    cosine_similarity
 
 
 def fillna_decorator(missing_value=np.nan):

recordlinkage/datasets/__init__.py

@@ -4,8 +4,8 @@
 
 import pandas
 
-from ..compat.six import BytesIO
-from ..compat.six.moves.urllib.request import urlopen
+from recordlinkage.compat.six import BytesIO
+from recordlinkage.compat.six.moves.urllib.request import urlopen
 
 
 def load_krebsregister(block=[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]):

recordlinkage/indexing.py

@@ -6,7 +6,7 @@
 import numpy
 
 from recordlinkage.utils import IndexError, merge_dicts, split_or_pass
-from recordlinkage.comparing import qgram_similarity
+from recordlinkage.algorithms.string import qgram_similarity
 
 
 def check_index_names(func):

recordlinkage/standardise/__init__.py

@@ -1,2 +1,2 @@
-from .cleaning import *
-from .encoding import *
+from recordlinkage.standardise.cleaning import *
+from recordlinkage.standardise.encoding import *

setup.py

@@ -25,8 +25,13 @@ def read(fname):
     url="http://recordlinkage.readthedocs.io/",
 
     install_requires=["numpy", "pandas", "scipy", "sklearn"],
-    packages=['recordlinkage', 'recordlinkage.datasets',
-              'recordlinkage.standardise'],
+    packages=[
+        'recordlinkage',
+        'recordlinkage.datasets',
+        'recordlinkage.standardise',
+        'recordlinkage.algorithms',
+        'recordlinkage.compat'
+    ],
     include_package_data=True,
     package_dir={'recordlinkage': 'recordlinkage'},
     package_data={'recordlinkage': ['datasets/*/*.csv']},