Merge pull request #234 from micahcochran/ext-pyshp-pyproj

Make pyshp and pyproj external dependencies

Author: WeatherGod

.requirements-2.6.txt

@@ -0,0 +1 @@
+unittest2

.travis.yml

@@ -32,6 +32,10 @@ install:
     pip install --upgrade setuptools
     pip install $NUMPY
     pip install $MPL
+    pip install -r requirements.txt
+    
+  - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install -r .requirements-2.6.txt; fi
+  
   - |
     cd geos-3.3.3
     export GEOS_DIR=$HOME/.local/

Changelog

@@ -1,5 +1,7 @@
 version 1.0.8 (not yet released)
 --------------------------------
+* removes inline pyshp and pyproj code and uses makes these packages required
+  external dependencies (handling issue 230).
 * add 'textcolor' kwarg to drawmeridians and drawparallels (issue 145).
 * don't assume grid is regular when adding cyclic point in addcyclic. 
   New kwargs 'axis' and 'cyclic' added.  More than one array

LICENSE_pyshp

@@ -11,6 +11,10 @@ using matplotlib.
 
 * numpy 
 
+* [pyproj](https://github.com/jswhit/pyproj)
+
+* [pyshp](https://github.com/GeospatialPython/pyshp)
+
 * The GEOS (Geometry Engine - Open Source) library (version 3.1.1 or higher).
 Source code is included in the geos-3.3.3 directory.
 
@@ -31,9 +35,6 @@ source code for the GEOS library is
 included in the 'geos-3.3.3' directory under the terms given in
 LICENSE_geos.
 
-shapefile.py from pyshp.googlecode.com is included under the terms given
-in LICENSE_pyshp.
-
 the land-sea mask, coastline, lake, river and political boundary data are extracted
 from datasets provided with the [Generic Mapping Tools (GMT)](http://gmt.soest.hawaii.edu)
 and are included under the terms given in LICENSE_data.

README.md

@@ -23,8 +23,9 @@
 from numpy import *
 import matplotlib.pyplot as pl
 from matplotlib.pyplot import *
-from mpl_toolkits.basemap import Basemap, pyproj
-from mpl_toolkits.basemap.pyproj import Geod
+from mpl_toolkits.basemap import Basemap
+import pyproj
+from pyproj import Geod
 
 __all__ = ['AllSkyMap']
 

examples/allskymap.py

@@ -3,7 +3,8 @@
 from a WMS server and display it on a map (using the
 wmsimage convenience method)
 """
-from mpl_toolkits.basemap import Basemap, pyproj
+from mpl_toolkits.basemap import Basemap
+import pyproj
 from datetime import datetime
 import numpy as np
 import matplotlib.pyplot as plt

examples/testwmsimage.py

@@ -1,5 +1,5 @@
 from __future__ import print_function
-from mpl_toolkits.basemap import pyproj
+import pyproj
 from mpl_toolkits.basemap import Basemap
 import matplotlib.pyplot as plt
 # proj4 definition of UTM zone 17.

examples/utmtest.py

@@ -27,7 +27,7 @@
 from matplotlib.patches import Ellipse, Circle, Polygon, FancyArrowPatch
 from matplotlib.lines import Line2D
 from matplotlib.transforms import Bbox
-from . import pyproj
+import pyproj
 from mpl_toolkits.axes_grid1 import make_axes_locatable
 from matplotlib.image import imread
 import sys, os, math
@@ -2128,7 +2128,7 @@ def readshapefile(self,shapefile,name,drawbounds=True,zorder=None,
         matplotlib.patches.LineCollection object is appended to the tuple.
         """
         import shapefile as shp
-        from .shapefile import Reader
+        from shapefile import Reader
         shp.default_encoding = default_encoding
         if not os.path.exists('%s.shp'%shapefile):
             raise IOError('cannot locate %s.shp'%shapefile)

lib/mpl_toolkits/basemap/__init__.py

@@ -1,5 +1,5 @@
 import numpy as np
-from . import pyproj
+import pyproj
 import math
 from matplotlib.cbook import dedent