Merge remote-tracking branch 'refs/remotes/matplotlib/master'

Author: Micah Cochran

.travis.yml

@@ -46,5 +46,5 @@ install:
   - python setup.py install
 
 script:
-    - python lib/mpl_toolkits/basemap/test.py
+    - python lib/mpl_toolkits/basemap/test.py --verbose
 

README.md

@@ -5,7 +5,7 @@ using matplotlib.
 
 ##Requirements
 
-* python 2.5 (or higher)
+* Python 2.6 (or higher)
 
 * matplotlib
 
@@ -18,18 +18,21 @@ using matplotlib.
 * The GEOS (Geometry Engine - Open Source) library (version 3.1.1 or higher).
 Source code is included in the geos-3.3.3 directory.
 
-* [PIL](http://pythonware.com/products/pil) is optional (only
-needed for Basemap warpimage and bluemarble methods).
-
 * On linux, if your python was installed via a package management system, make
 sure the corresponding "python-dev" package is also installed.  Otherwise, you
 may not have the python header (Python.h), which is required to build python
 C extensions.
 
-##Copyright
+###Optional
+
+* [OWSLib](https://github.com/geopython/OWSLib) (optional) It is needed
+for the BaseMap.wmsimage function.
 
-source code from [proj.4](http://trac.osgeo.org/proj/) is included in the
-'src' directory under the terms given in LICENSE_proj4.
+* [Pillow](https://python-pillow.github.io/) (optional)  It is
+needed for Basemap warpimage, bluemarble, shadedrelief, and etop methods.
+PIL should work on Python 2.x.  Pillow is a maintained fork of PIL.
+
+##Copyright
 
 source code for the GEOS library is
 included in the 'geos-3.3.3' directory under the terms given in
@@ -39,7 +42,7 @@ the land-sea mask, coastline, lake, river and political boundary data are extrac
 from datasets provided with the [Generic Mapping Tools (GMT)](http://gmt.soest.hawaii.edu)
 and are included under the terms given in LICENSE_data.
 
-Everything else (including src/_proj.pyx, src/_proj.c, src/_geos.c, and src/_geos.pyx):
+Everything else (including src/_geos.c, and src/_geos.pyx):
 
 copyright (c) 2011 by Jeffrey Whitaker.
 

examples/run_all.py

@@ -12,6 +12,17 @@
 test_files.remove('plothighsandlows.py') # requires scipy
 test_files.remove('lic_demo.py')
 test_files.remove('testwmsimage.py')
+try:
+    from netCDF4 import Dataset
+except ImportError:
+    # remove tests requiring netCDF4
+    sys.stdout.write("Could not import netCDF4, skipping tests that require netCDF4.\n")
+    test_files.remove('streamplot_demo.py')
+    test_files.remove('plotprecip.py')
+    test_files.remove('test_rotpole.py')
+    test_files.remove('ccsm_popgrid.py')
+    test_files.remove('ploticos.py')
+
 py_path = os.environ.get('PYTHONPATH')
 if py_path is None:
     py_path = '.'

lib/mpl_toolkits/basemap/__init__.py

@@ -1460,6 +1460,8 @@ def _readboundarydata(self,name,as_polygons=False):
                             if not as_polygons or len(b) > 4:
                                 polygons.append(list(zip(b[:,0],b[:,1])))
                                 polygon_types.append(typ)
+        bdatfile.close()
+        bdatmetafile.close()
         return polygons, polygon_types
 
     def _getmapboundary(self):

lib/mpl_toolkits/basemap/diagnostic.py

@@ -0,0 +1,61 @@
+"""
+These are diagnostic and debugging functions for basemap.
+"""
+
+def package_versions():
+    """
+    Gives version information for dependent packages.
+
+    returns namedtuple BasemapPackageVersions
+    """
+    from collections import namedtuple
+    from sys import version as sys_version
+
+    from matplotlib import __version__ as matplotlib_version
+    from numpy import __version__ as numpy_version
+    import pyproj
+    from shapefile import __version__ as pyshp_version
+
+    import _geoslib
+    from mpl_toolkits.basemap import __version__ as basemap_version
+    
+    # import optional dependencies
+    try:
+        from OWSLib import __version__ as OWSLib_version
+    except ImportError:
+        OWSLib_version = 'not installed'
+
+    try:
+        from PIL import VERSION as pil_version
+        try:
+            from PIL import PILLOW_VERSION as pillow_version
+        except ImportError:
+            pillow_version = 'not installed'
+    except ImportError:
+        pil_version = 'not installed'
+        pillow_version = 'not installed'
+    
+    # Get PROJ.4 version info in a floating point number
+    proj_ver_num = pyproj.Proj(init='epsg:4326').proj_version
+    # reformats floating point number into string (4.90 becomes '4.9.0')
+    proj4_version = '.'.join(list(str(int(proj_ver_num*100))))
+    
+    BasemapPackageVersions = namedtuple(
+                               'BasemapPackageVersions',
+                               """Python, basemap, matplotlib,
+                                  numpy, pyproj, pyshp, PROJ4, GEOS,
+                                  OWSLib, PIL, Pillow""")
+
+    return BasemapPackageVersions(
+                   Python = sys_version,
+                   basemap = basemap_version,
+                   matplotlib = matplotlib_version,
+                   numpy = numpy_version,
+                   pyproj = pyproj.__version__,
+                   pyshp = pyshp_version,
+                   PROJ4 = proj4_version,
+                   GEOS = _geoslib.__geos_version__,
+                   # optional dependencies below
+                   OWSLib = OWSLib_version,
+                   PIL = pil_version,
+                   Pillow = pillow_version)

lib/mpl_toolkits/basemap/test.py

@@ -206,5 +206,19 @@ def test():
 
 
 if __name__ == '__main__':
+    # When called with the -v / --verbose commandline parameter, it will
+    # give package dependent version information:
+    #   $ python test.py --verbose
+
+    import sys
     import unittest
+
+    from mpl_toolkits.basemap.diagnostic import package_versions
+    
+    if '--verbose' in sys.argv or '-v' in sys.argv:
+        pkg_vers = package_versions()
+        print('Basemaps installed package versions:')
+        print('{0}\n'.format(pkg_vers))
+
     unittest.main()
+