update optional req for pyshp

Kully · Kully · commit ccbbb5d7f83f · 2018-02-13T13:55:32.000-05:00
diff --git a/optional-requirements.txt b/optional-requirements.txt
@@ -31,5 +31,5 @@ ipykernel
 
 ## deps for _county_choropleth.py figure factory
 geopandas
-shapefile
+pyshp
 shapely
diff --git a/plotly/figure_factory/_county_choropleth.py b/plotly/figure_factory/_county_choropleth.py
@@ -552,22 +552,9 @@ def create_choropleth(fips, values, scope=['usa'], endpts=None,
     ```
     """
     # ensure shapely imported
-    if not shapely:
-        raise exceptions.ImportError(
-            "'shapely' must be installed for this figure factory."
-        )
-
-    # ensure geopandas imported
-    if not gp:
-        raise exceptions.ImportError(
-            "'geopandas' must be installed for this figure factory."
-        )
-
-    # ensure pandas imported
-    if not pd:
-        raise exceptions.ImportError(
-            "'shapefile' must be installed for this figure factory."
-        )
+    if not gp or not shapefile or not shapely:
+        raise ImportError("geopandas, shapefile and shapely must be "
+                          "installed for this figure factory")
 
     if not state_outline:
         state_outline = {'color': 'rgb(240, 240, 240)',
