From 2049e89819e72e4e9cdbf310e4c13fd0bee2becc Mon Sep 17 00:00:00 2001
From: Robert Smallshire <robert@smallshire.org.uk>
Date: Thu, 4 Jun 2015 15:21:22 +0200
Subject: [PATCH 1/3] Remove the ext subpackage.

import segpy.ext.numpy will no longer be supported. It just doesn't play nice with a lot of Python tooling.  In future it will be
import segpy_numpy
---
 segpy/ext/__init__.py | 20 --------------------
 1 file changed, 20 deletions(-)
 delete mode 100644 segpy/ext/__init__.py

diff --git a/segpy/ext/__init__.py b/segpy/ext/__init__.py
deleted file mode 100644
index ba891c3..0000000
--- a/segpy/ext/__init__.py
+++ /dev/null
@@ -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()

From 506ce10581caf78b79a1dc6390b4ac9711975c55 Mon Sep 17 00:00:00 2001
From: Robert Smallshire <robert@smallshire.org.uk>
Date: Thu, 4 Jun 2015 15:22:21 +0200
Subject: [PATCH 2/3] Removes segpy_numpy.__init__.py

---
 segpy-ext/segpy-numpy/segpy_numpy/__init__.py | 9 ---------
 1 file changed, 9 deletions(-)
 delete mode 100644 segpy-ext/segpy-numpy/segpy_numpy/__init__.py

diff --git a/segpy-ext/segpy-numpy/segpy_numpy/__init__.py b/segpy-ext/segpy-numpy/segpy_numpy/__init__.py
deleted file mode 100644
index 9ec47b5..0000000
--- a/segpy-ext/segpy-numpy/segpy_numpy/__init__.py
+++ /dev/null
@@ -1,9 +0,0 @@
-
-from pkgutil import extend_path
-
-#__path__ = extend_path(__path__, __name__)
-__version__ = '2.0.0a1'
-
-
-def load():
-    pass

From 39988a2ca08035eb59d28a0daef848ab4d0c98eb Mon Sep 17 00:00:00 2001
From: Robert Smallshire <robert@smallshire.org.uk>
Date: Thu, 4 Jun 2015 17:11:43 +0200
Subject: [PATCH 3/3] Removes the segpy_numpy/numpy directory.

---
 examples/timeslice.py                                     | 2 +-
 segpy-ext/segpy-numpy/segpy_numpy/{numpy => }/__init__.py | 0
 segpy-ext/segpy-numpy/segpy_numpy/{numpy => }/dtypes.py   | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename segpy-ext/segpy-numpy/segpy_numpy/{numpy => }/__init__.py (100%)
 rename segpy-ext/segpy-numpy/segpy_numpy/{numpy => }/dtypes.py (100%)

diff --git a/examples/timeslice.py b/examples/timeslice.py
index ee7a217..7a93b87 100644
--- a/examples/timeslice.py
+++ b/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):
diff --git a/segpy-ext/segpy-numpy/segpy_numpy/numpy/__init__.py b/segpy-ext/segpy-numpy/segpy_numpy/__init__.py
similarity index 100%
rename from segpy-ext/segpy-numpy/segpy_numpy/numpy/__init__.py
rename to segpy-ext/segpy-numpy/segpy_numpy/__init__.py
diff --git a/segpy-ext/segpy-numpy/segpy_numpy/numpy/dtypes.py b/segpy-ext/segpy-numpy/segpy_numpy/dtypes.py
similarity index 100%
rename from segpy-ext/segpy-numpy/segpy_numpy/numpy/dtypes.py
rename to segpy-ext/segpy-numpy/segpy_numpy/dtypes.py