Merge pull request #631 from ocefpaf/versioneer

Use versioneer

Author: ocefpaf

.gitattributes

@@ -0,0 +1 @@
+folium/_version.py export-subst

.travis.yml

@@ -54,7 +54,7 @@ script:
 
     - if [[ $TEST_TARGET == 'latest_branca' ]]; then
         pip install git+https://github.com/python-visualization/branca.git ;
-        python setup.py test ;
+        py.test -vv --ignore=tests/notebooks/test_notebooks.py ;
       fi
 
     - if [[ $TEST_TARGET == 'notebooks' ]]; then

MANIFEST.in

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

docs/contributing.rst

@@ -1,16 +1,10 @@
-Contributing
-============
+Contributing to folium
+======================
 
-Choose the sandbox folder of your choice (`~/sandbox` for example)
-::
+We welcome contributions to folum in many forms.
 
-$ cd ~/sandbox
+Examples of contributions include:
 
-Clone `folium` from github:
-::
-
-$ git clone https://github.com/python-visualization/folium
-
-Push code to your fors, and write a pull request.
-
-TODO: end up this section.
+* Code patches
+* Documentation improvements
+* Bug reports and patch reviews

folium/__init__.py

@@ -17,7 +17,11 @@
     TopoJson, WmsTileLayer
 )
 
-__version__ = '0.4.0.dev0'
+
+from ._version import get_versions
+
+__version__ = get_versions()['version']
+del get_versions
 
 __all__ = [
     'CssLink',