Merge upstream.

Author: jtbaker

.appveyor.yml

@@ -0,0 +1,30 @@
+build: false
+
+environment:
+  matrix:
+    - PYTHON: "C:\\Miniconda36-x64"
+      PY: 3.7
+
+init:
+  - "ECHO %PYTHON_VERSION% %MINICONDA%"
+
+install:
+  # Install and configure miniconda.
+  - "set PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
+  - conda config --set always_yes yes --set changeps1 no --set show_channel_urls true
+  - conda update conda --quiet
+  - conda config --add channels conda-forge --force
+  - conda install pycryptosat
+  - conda config --set safety_checks disabled
+
+  # Create the test env.
+  - conda create --name TEST python=%PY% --file requirements.txt --file requirements-dev.txt
+  - activate TEST
+
+  # Debug.
+  - conda info --all
+  - conda list
+
+test_script:
+  - pip install -e . --no-deps --force-reinstall
+  - pytest -n 2 -rxXs tests

.github/CONTRIBUTING.md

@@ -44,27 +44,47 @@ Whenever possible, please also include a [short, self-contained code example](ht
 
 First of all, thanks for your interest in contributing!
 
-- If you are new to git/Github, please take check a few tutorials
-  on [git](https://git-scm.com/docs/gittutorial) and [GitHub](https://guides.github.com/).
-- The basic workflow for contributing is:
-  1. [Fork](https://help.github.com/articles/fork-a-repo/) the repository
-  2. [Clone](https://help.github.com/articles/cloning-a-repository/) the repository to create a local copy on your computer:
-    ```
-    git clone [email protected]:${user}/folium.git
-    cd folium
-    ```
-  3. Create a branch for your changes
-    ```
-    git checkout -b name-of-your-branch
-    ```
-  4. Make change to your local copy of the folium repository
-  5. Commit those changes
-    ```
-    git add file1 file2 file3
-    git commit -m 'a descriptive commit message'
-    ```
-  6. Push your updated branch to your fork
-    ```
-    git push origin name-of-your-branch
-    ```
-  7. [Open a pull request](https://help.github.com/articles/creating-a-pull-request/) to the python-visualization/folium
+If you are new to git/Github, please take check a few tutorials
+on [git](https://git-scm.com/docs/gittutorial) and [GitHub](https://guides.github.com/).
+
+The basic workflow for contributing is:
+
+1. [Fork](https://help.github.com/articles/fork-a-repo/) the repository
+2. [Clone](https://help.github.com/articles/cloning-a-repository/) the repository to create a local copy on your computer:
+   ```
+   git clone [email protected]:${user}/folium.git
+   cd folium
+   ```
+3. Create a branch for your changes
+   ```
+   git checkout -b name-of-your-branch
+   ```
+4. Install the [miniconda](https://docs.conda.io/en/latest/miniconda.html) to avoid any external library errors.
+
+   If using `conda` one can create a development environment with:
+   ```
+   $ conda create --name FOLIUM python=3.7 --file requirements.txt --file requirements-dev.txt
+   ```
+5. Install the dependencies listed in `requirements.txt` and `requirements-dev.txt`.
+   ```
+   pip install -r requirements.txt
+   pip install -r requirements-dev.txt
+   ```
+6. Install Firefox, download [geckodriver](https://github.com/mozilla/geckodriver/releases) 
+   and put it in the PATH.
+7. Make changes to your local copy of the folium repository
+8. Make sure the tests pass:
+   * in the repository folder do `pip install -e . --no-deps`  (needed for notebook tests)
+   * run `python -m pytest tests`
+   * run `flake8 folium --max-line-length=120`
+   * resolve all errors
+9. Commit those changes
+   ```
+   git add file1 file2 file3
+   git commit -m 'a descriptive commit message'
+   ```
+10. Push your updated branch to your fork
+   ```
+   git push origin name-of-your-branch
+   ```
+11. [Open a pull request](https://help.github.com/articles/creating-a-pull-request/) to the python-visualization/folium

.gitignore

@@ -0,0 +1,19 @@
+*.egg-info/
+*.pyc
+.ipynb_checkpoints
+.pytest_cache
+build/
+dist/
+docs/_build/
+docs/quickstart.ipynb
+examples/results/*
+.cache/
+.idea/
+/*.xml
+/codestyles/*.xml
+/_mac/*.xml
+/inspection/*.xml
+geckodriver.log
+geckodriver.tar.gz
+geckodriver/
+miniconda.sh

.stickler.yml

@@ -2,5 +2,6 @@ linters:
   flake8:
     max-line-length: 120
     max-complexity: 10
+    python: 3
 files:
   ignore: ['*.ipynb', 'conf.py']

.travis.yml

@@ -1,79 +1,129 @@
-language: python
+language: minimal
 
 sudo: false
 
+env:
+  - MOZ_HEADLESS=1
+
+addons:
+  firefox: latest
+
 env:
   global:
-    - secure: "gRT413onDOvwgiHpNXRsiqo+ZZSjwwBpjZryQ9h6IqYw6cTN9YVivYF15uTMD//mZyFeHRz+F/7/0EG2z+UYIBKbgktiNMbie/KizwRBnCThGpcch1VeizkBkPluWSQXndXM6STkHvn0eZBZBBh0QdTm1qaI0babUmgZuWhrX38="
+    - secure: "MTRxGE7N7I60vOk3f32NZjL2BLmP1H0W11HqfcbDO9IEN9Pb47mXQW6rNF0ZqOTt78kWtcHsR2non+nrLIjkglAb4psjUWOdQVh73y3JU4OrXqGCLssgIq9m6fMGOeFWvdektKG4v0TlnYwLhd6Lzes6eTrc+Z2UMHf4dZtuOPs="
 
 matrix:
   fast_finish: true
   include:
-  - python: 2.7
-    env: TEST_TARGET=default
-  - python: 3.6
-    env: TEST_TARGET=default
-  - python: 3.6
-    env: TEST_TARGET=notebooks
-  - python: 3.6
-    env: TEST_TARGET=latest_branca
-  - python: 3.6
-    env: TEST_TARGET=docs
+  - name: default
+    env: PY=3.7
+  - name: notebooks-conding-standard
+    env: PY=3.7
+  - name: notebooks-code
+    env: PY=3.7
+  - name: latest-branca
+    env: PY=3.7
+  - name: docs
+    env: PY=3.7
+  - name: "tarball"
+    env: PY=3.7
   allow_failures:
-  - python: 2.7
-    env: TEST_TARGET=latest_branca
-  - python: 3.6
-    env: TEST_TARGET=latest_branca
+  - name: latest-branca
+    env: PY=3.7
+  - name: linkcheck
+    env: PY=3.7
+  - name: notebooks-conding-standard
+    env: PY=3.7
 
 before_install:
-  - wget http://bit.ly/miniconda -O miniconda.sh
-  - bash miniconda.sh -b -p $HOME/miniconda
-  - export PATH="$HOME/miniconda/bin:$PATH"
-  - conda config --set always_yes yes --set changeps1 no --set show_channel_urls true
-  - conda update conda
-  - conda config --add channels conda-forge --force
-  - conda create --name TEST python=$TRAVIS_PYTHON_VERSION phantomjs --file requirements.txt --file requirements-dev.txt
-  - source activate TEST
-
-  - if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
-      conda install mock ;
-    fi
+  # Install miniconda and create TEST env.
+  - |
+    wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
+    bash miniconda.sh -b -p $HOME/miniconda
+    export PATH="$HOME/miniconda/bin:$PATH"
+    conda config --set always_yes yes --set changeps1 no --set show_channel_urls true
+    conda update conda --quiet
+    conda config --add channels conda-forge --force
+    conda config --set channel_priority strict
+    conda config --set safety_checks disabled
+    conda create --name TEST python=$PY --file requirements.txt --file requirements-dev.txt
+    source activate TEST
+  # Install firefox headless driver.
+  - |
+    wget https://github.com/mozilla/geckodriver/releases/download/v0.23.0/geckodriver-v0.23.0-linux64.tar.gz -O geckodriver.tar.gz
+    mkdir geckodriver
+    tar -xzf geckodriver.tar.gz -C geckodriver
+    export PATH=$PATH:$PWD/geckodriver
+
 
 # Test source distribution.
 install:
-  - python setup.py sdist && version=$(python setup.py --version) && pushd dist  && pip install folium-${version}.tar.gz && popd
+  - pip install -e . --no-deps --force-reinstall
 
 script:
-  - if [[ $TEST_TARGET != 'docs' ]]; then
-      cp -r tests/ examples/ /tmp && cd /tmp ;
+  - if [[ $TRAVIS_JOB_NAME == 'tarball' ]]; then
+      pip wheel . -w dist --no-deps ;
+      check-manifest --verbose ;
+      twine check dist/* ;
+    fi
+
+  - if [[ $TRAVIS_JOB_NAME != 'docs' ]]; then
+      cp -r tests/ examples/ /tmp ;
     fi
 
-  - if [[ $TEST_TARGET == 'default' ]]; then
-      py.test -vv --ignore=tests/notebooks/test_notebooks.py ;
+  - if [[ $TRAVIS_JOB_NAME == 'default' ]]; then
+      pytest /tmp -vv --ignore=tests/notebooks/test_notebooks.py ;
     fi
 
-  - if [[ $TEST_TARGET == 'latest_branca' ]]; then
+  - if [[ $TRAVIS_JOB_NAME == 'latest-branca' ]]; then
       conda uninstall branca ;
       pip install git+https://github.com/python-visualization/branca.git ;
-      py.test -vv --ignore=tests/notebooks/test_notebooks.py ;
+      pytest /tmp -vv --ignore=tests/notebooks/test_notebooks.py ;
+    fi
+
+  - if [[ $TRAVIS_JOB_NAME == 'notebooks-conding-standard' ]]; then
+      for NB in $(find . -type f -name "*.ipynb");
+      do jupyter nbconvert --template=tests/strip_markdown.tpl --stdout --to python "${NB}" | flake8 - --ignore=W391,E226,E402,,W504,I100,I201,I202 --max-line-length=120 --show-source ;
+      done ;
     fi
 
-  - if [[ $TEST_TARGET == 'notebooks' ]]; then
-      for file in $(find . -type f -name "*.ipynb"); do jupyter nbconvert --template=tests/strip_markdown.tpl --stdout --to python $file | grep -v '^get_ipython' | flake8 - --ignore=W391,E226,E402,I100 --max-line-length=100 --show-source ; done ;
-      py.test -vv tests/notebooks/test_notebooks.py ;
+  - if [[ $TRAVIS_JOB_NAME == 'notebooks-code' ]]; then
+      pytest --nbval-lax /tmp/examples ;
     fi
 
-  - if [[ $TEST_TARGET == 'docs' ]]; then
-      set -e ;
-      conda install doctr ;
+# Docs
+  - |
+    if [[ $TRAVIS_JOB_NAME == 'docs' ]]; then
+      set -e
+      conda install doctr
+      cp examples/Quickstart.ipynb docs/quickstart.ipynb
+      pushd docs
+      make clean html
+      popd
+      if [[ -z "$TRAVIS_TAG" ]]; then 
+        python -m doctr deploy --build-tags --key-path github_deploy_key_python_visualization_folium.enc --built-docs docs/_build/html/ dev
+      else
+        python -m doctr deploy --build-tags --key-path github_deploy_key_python_visualization_folium.enc --built-docs docs/_build/html/ "version-$TRAVIS_TAG"
+        python -m doctr deploy --build-tags --key-path github_deploy_key_python_visualization_folium.enc --built-docs docs/_build/html/ .
+      fi
+    fi
+
+
+  - if [[ $TRAVIS_JOB_NAME == 'linkcheck' ]]; then
       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" ;
+      pushd docs && make clean html linkcheck && popd ;
     fi
 
-doctr:
-  require-master: true
-  sync: False
+deploy:
+  skip_cleanup: true
+  provider: pypi
+  user: ocefpaf
+  password:
+    secure: "BdJc76Z+DnmmamZSX+QCGZDnf+FW/JQOnVZ2t59r2r2RM4860Wf6GSL/Ncw6v8G3sOghWQcMzFdY5e6aNzAW0Ddm2YKHAsfxgurbEsnlzwsNPBWv2280ca7TtlFk2JkqhtYQOkoBFbA8+e/lC8ZC6aAVffQAT1NE4lEs0/Jd+TA="
+  distributions: sdist bdist_wheel
+  upload_docs: no
+  on:
+    repo: python-visualization/folium
+    tags: true
+    all_branches: master
+    condition: '$TRAVIS_JOB_NAME == "default"'