Merge pull request #1410 from ocefpaf/drop_versioneer

Author: ocefpaf

.gitattributes

@@ -22,3 +22,4 @@ chromedriver/
 miniconda.sh
 latest_logs/
 *.nbconvert.ipynb
+folium/_version.py

.gitignore

@@ -74,6 +74,7 @@ install:
 
 script:
   - if [[ $TRAVIS_JOB_NAME == 'tarball' ]]; then
+      python setup.py --version ;
       pip wheel . -w dist --no-deps ;
       check-manifest --verbose ;
       twine check dist/* ;

.travis.yml

@@ -4,5 +4,6 @@ recursive-include folium *.py
 recursive-include folium *.js
 recursive-include folium/plugins *
 recursive-include folium/templates *
-include versioneer.py
+
 prune examples/
+exclude folium/_version.py

MANIFEST.in

@@ -53,9 +53,8 @@
 
 # The full version, including alpha/beta/rc tags.
 
-from folium._version import get_versions
-release = get_versions()['version']
-del get_versions
+import folium
+version = release = folium.__version__
 
 # The short X.Y version.
 version = '.'.join(release.split('.')[:2])

docs/conf.py

@@ -16,7 +16,6 @@
     MacroElement,
 )
 
-from folium._version import get_versions
 from folium.features import (
     Choropleth,
     ClickForMarker,
@@ -45,8 +44,11 @@
 from folium.raster_layers import TileLayer, WmsTileLayer
 from folium.vector_layers import Circle, CircleMarker, PolyLine, Polygon, Rectangle
 
-__version__ = get_versions()['version']
-del get_versions
+try:
+    from ._version import __version__
+except ImportError:
+    __version__ = "unknown"
+
 
 if tuple(int(x) for x in branca.__version__.split('.')[:2]) < (0, 3):
     raise ImportError('branca version 0.3.0 or higher is required. '