Fix show_versions() for pyproj 1.9.6 (#1097)

* also fix gdal version

.travis.yml

@@ -39,6 +39,7 @@ install:
   - if [ "$DEV" ]; then pip install git+https://github.com/matplotlib/matplotlib.git; fi
   - pip install -e .
   - conda list
+  - python -c "import geopandas; geopandas.show_versions();"
 
 script:
   - py.test geopandas --cov geopandas -v --cov-report term-missing

geopandas/tests/test_show_versions.py

@@ -18,7 +18,7 @@ def test_get_c_info():
     assert 'GEOS' in C_info
     assert 'GEOS lib' in C_info
     assert 'GDAL' in C_info
-    assert 'GDAL dir' in C_info
+    assert 'GDAL data dir' in C_info
     assert 'PROJ' in C_info
     assert 'PROJ data dir' in C_info
 

geopandas/tools/_show_versions.py

@@ -31,38 +31,49 @@ def _get_C_info():
     """
     try:
         import pyproj
+        proj_version = pyproj.proj_version_str
+    except Exception:
+        proj_version = None
+    try:
+        # pyproj > 2.0
         from pyproj.exceptions import DataDirError
-        proj = pyproj.proj_version_str
         try:
             proj_dir = pyproj.datadir.get_data_dir()
         except DataDirError:
             proj_dir = None
     except Exception:
-        proj = None
-        proj_dir = None
+        try:
+            # pyproj 1.9.6
+            import pyproj
+            proj_dir = pyproj.pyproj_datadir
+        except Exception:
+            proj_dir = None
 
     try:
         import shapely._buildcfg
-        geos = '{}.{}.{}'.format(*shapely._buildcfg.geos_version)
+        geos_version = '{}.{}.{}'.format(*shapely._buildcfg.geos_version)
         geos_dir = shapely._buildcfg.geos_library_path
     except Exception:
-        geos = None
+        geos_version = None
         geos_dir = None
 
     try:
         import fiona
-        gdal = fiona.env.get_gdal_release_name()
+        gdal_version = fiona.env.get_gdal_release_name()
+    except Exception:
+        gdal_version = None
+    try:
+        import fiona
         gdal_dir = fiona.env.GDALDataFinder().search()
     except Exception:
-        gdal = None
         gdal_dir = None
 
     blob = [
-            ("GEOS", geos),
+            ("GEOS", geos_version),
             ("GEOS lib", geos_dir),
-            ("GDAL", gdal),
-            ("GDAL dir", gdal_dir),
-            ("PROJ", proj),
+            ("GDAL", gdal_version),
+            ("GDAL data dir", gdal_dir),
+            ("PROJ", proj_version),
             ("PROJ data dir", proj_dir)
             ]