Merge branch 'ext-rework'

examples/timeslice.py

@@ -33,7 +33,7 @@ import traceback
 import numpy as np
 
 from segpy.reader import create_reader
-from segpy_numpy.numpy.dtypes import make_dtype
+from segpy_numpy.dtypes import make_dtype
 
 
 class DimensionalityError(Exception):

segpy-ext/segpy-numpy/segpy_numpy/__init__.py

@@ -1,9 +1 @@
 
-from pkgutil import extend_path
-
-#__path__ = extend_path(__path__, __name__)
-__version__ = '2.0.0a1'
-
-
-def load():
-    pass

segpy-ext/segpy-numpy/segpy_numpy/numpy/__init__.py

@@ -1 +0,0 @@
-

segpy/ext/__init__.py

@@ -1,20 +0,0 @@
-import pkg_resources
-
-loaded = set()
-
-
-def load_entry_points(name=None):
-    """Load extension packages into the segpy.ext namespace.
-
-    Any packages registered against the 'segpy.ext' entry-point group will be
-    installed dynamically into the segpy.ext namespace.
-    """
-    for entry_point in pkg_resources.iter_entry_points(group='segpy.ext', name=name):
-        package = entry_point.load()
-        if package not in loaded:
-            loaded.add(package)
-            __path__.extend(package.__path__)
-            package.load()
-
-
-load_entry_points()