fix docs

Author: ocefpaf

.travis.yml

@@ -15,20 +15,20 @@ env:
 matrix:
   fast_finish: true
   include:
-  - name: default-python2
-    env: TEST_TARGET=default PY=2.7
+  - name: legacy-python
+    env: PY=2.7
   - name: default
-    env: TEST_TARGET=default PY=3.7
+    env: PY=3.7
   - name: notebooks-conding-standard
     env: PY=3.7
   - name: notebooks-code
     env: PY=3.7
-  - name: latest_branca
+  - name: latest-branca
     env: PY=3.7
   - name: docs
     env: PY=3.7
   allow_failures:
-  - name: latest_branca
+  - name: latest-branca
     env: PY=3.7
 
 before_install:
@@ -60,11 +60,15 @@ script:
       cp -r tests/ examples/ /tmp ;
     fi
 
-  - if [[ $TEST_TARGET == 'default' ]]; then
+  - if [[ $TRAVIS_JOB_NAME == 'default' ]]; then
+      pytest /tmp -vv --ignore=tests/notebooks/test_notebooks.py ;
+    fi
+
+  - if [[ $TRAVIS_JOB_NAME == 'legacy-python' ]]; then
       pytest /tmp -vv --ignore=tests/notebooks/test_notebooks.py ;
     fi
 
-  - if [[ $TRAVIS_JOB_NAME == 'latest_branca' ]]; then
+  - if [[ $TRAVIS_JOB_NAME == 'latest-branca' ]]; then
       conda uninstall branca ;
       pip install git+https://github.com/python-visualization/branca.git ;
       pytest /tmp -vv --ignore=tests/notebooks/test_notebooks.py ;
@@ -80,15 +84,21 @@ script:
       pytest --nbval-lax -p no:python /tmp/examples ;
     fi
 
-  - if [[ $TEST_TARGET == 'docs' ]]; then
+# Docs
+  - if [[ -z "$TRAVIS_TAG" ]]; then 
+      DEPLOY_DIR=dev ;
+    else
+      DEPLOY_DIR="version-$TRAVIS_TAG" ;
+    fi
+
+  - if [[ $TRAVIS_JOB_NAME == 'docs' ]]; then
       set -e ;
       conda install doctr ;
       cp examples/Quickstart.ipynb docs/quickstart.ipynb ;
       pushd docs ;
       make clean html linkcheck ;
       popd ;
-      python -m doctr deploy --sync .;
-      python -m doctr deploy --sync --no-require-master  --built-docs docs/_build/html "docs-$TRAVIS_BRANCH" ;
+      python -m doctr deploy --build-tags --key-path github_deploy_key.enc --built-docs docs/_build/html/ $DEPLOY_DIR
     fi
 
 doctr:

README.rst

@@ -44,10 +44,8 @@ or
 Documentation
 -------------
 
-https://python-visualization.github.io/folium/docs-v0.6.0/
+https://python-visualization.github.io/folium/
 
-The documentation for the development version can be found here:
-https://python-visualization.github.io/folium/docs-master/
 
 Gallery
 -------