From ccabaa87f553833963cac7207058dfece76ed8a0 Mon Sep 17 00:00:00 2001
From: Stuart Grieve <s.grieve@ucl.ac.uk>
Date: Fri, 29 Jun 2018 10:40:38 +0100
Subject: [PATCH 1/4] fixing broken paths in the readme

---
 README.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.rst b/README.rst
index 19099e2..878f1fc 100644
--- a/README.rst
+++ b/README.rst
@@ -64,7 +64,7 @@ Dependencies can be tracked by visiting `requires.io <https://requires.io/github
 Tests
 ----------
 
-A range of unit tests are included in the `/tests/` directory. These can
+A range of unit tests are included in the `/test/` directory. These can
 be run using `pytest`:
 
 .. code-block:: bash
@@ -84,7 +84,7 @@ The first step in using ``spatial_efd`` is always to load a shapefile:
 .. code-block:: python
 
     import spatial_efd
-    shp = spatial_efd.LoadGeometries('tests/fixtures/example_data.shp')
+    shp = spatial_efd.LoadGeometries('test/fixtures/example_data.shp')
 
 This creates a shapefile object ``shp`` which contains the polygon geometries we want to analyze. As in most cases more than one polygon will be stored in an individual file, a single polygon can be selected for processing using python's list notation:
 
@@ -162,7 +162,7 @@ All of the above examples have focused on processing a single polygon from a mul
 
 .. code-block:: python
 
-    shp = spatial_efd.LoadGeometries('tests/fixtures/example_data.shp')
+    shp = spatial_efd.LoadGeometries('test/fixtures/example_data.shp')
 
     coeffsList = []
 
@@ -251,7 +251,7 @@ In the case of the non-normalized data plotted above, these ellipses can also be
    shape_id = 1
    shpinstance = spatial_efd.generateShapefile()
    shpinstance = spatial_efd.writeGeometry(coeffs, x, y, harmonic, shpinstance, shape_id)
-   spatial_efd.saveShapefile('myShapefile', shpinstance, prj='tests/fixtures/example_data.prj')
+   spatial_efd.saveShapefile('myShapefile', shpinstance, prj='test/fixtures/example_data.prj')
 
 The first method called creates a blank shapefile object in memory, ready to be populated with Fourier ellipses. The second method can be wrapped in a loop to write as many ellipses as required to a single file. ``shape_id`` is written into the attribute table of the output shapefile and can be set to any integer as a means of identifying the Fourier ellipses. By passing in the existing ``example.prj`` file to the save method, a new projection file will be generated for the saved shapefile, ensuring that it has the correct spatial reference information for when it is loaded into a GIS package. Note that no reprojection is performed as the aim is for the input and output coordinate systems to match. If this parameter is excluded, the output shapefile will have no defined spatial reference system.
 

From e4ff7f75ba10e906901ff3180d53b66227157c64 Mon Sep 17 00:00:00 2001
From: Stuart Grieve <s.grieve@ucl.ac.uk>
Date: Fri, 29 Jun 2018 10:41:09 +0100
Subject: [PATCH 2/4] detecting python verison so module import doesnt fail on
 python3

---
 spatial_efd/__init__.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/spatial_efd/__init__.py b/spatial_efd/__init__.py
index e2a5e33..77cbbcf 100644
--- a/spatial_efd/__init__.py
+++ b/spatial_efd/__init__.py
@@ -1 +1,5 @@
-from spatial_efd import *
+import sys
+if(sys.version[0] == 2):
+	from spatial_efd import *
+else:
+	from .spatial_efd import *

From 9feec57c1678c1a2d2da631760a745ba854a5cfb Mon Sep 17 00:00:00 2001
From: Stuart Grieve <s.grieve@ucl.ac.uk>
Date: Fri, 29 Jun 2018 10:42:44 +0100
Subject: [PATCH 3/4] fixing broken hyperlink

---
 README.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index 878f1fc..4aedf79 100644
--- a/README.rst
+++ b/README.rst
@@ -57,7 +57,7 @@ Install ``spatial_efd`` by running:
 Dependencies
 ------------
 
-This package supports Python 2.7 and Python 3 and is tested on Linux and Windows environments, using both the standard python interpreter and [pypy](https://pypy.org). It requires ``matplotlib``, ``numpy``, ``future`` and ``pyshp``. These packages will all install automatically if ``spatial_efd`` is installed using ``pip``.
+This package supports Python 2.7 and Python 3 and is tested on Linux and Windows environments, using both the standard python interpreter and `pypy <https://pypy.org>`_. It requires ``matplotlib``, ``numpy``, ``future`` and ``pyshp``. These packages will all install automatically if ``spatial_efd`` is installed using ``pip``.
 
 Dependencies can be tracked by visiting `requires.io <https://requires.io/github/sgrieve/spatial_efd/requirements/?branch=master>`_
 

From 6a37564fcc9e699c33de99bccdeb719bedc040ce Mon Sep 17 00:00:00 2001
From: Stuart Grieve <s.grieve@ucl.ac.uk>
Date: Fri, 29 Jun 2018 10:49:30 +0100
Subject: [PATCH 4/4] increment version number for new release

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index b6785e8..99b17cf 100644
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,7 @@ def readme():
 
 
 setup(name='spatial_efd',
-      version='1.1.0',
+      version='1.1.1',
       description='Spatial elliptical fourier analysis',
       url='http://github.com/sgrieve/spatial-efd',
       long_description=readme(),