Skip to content

Commit e7f9c83

Browse files
authored
Merge pull request #436 from ocefpaf/split_branca_test
Split branca test
2 parents 6bb2d90 + 85c8321 commit e7f9c83

21 files changed

Lines changed: 407 additions & 12324 deletions

.travis.yml

Lines changed: 32 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,46 @@ language: python
22

33
sudo: false
44

5-
env:
6-
- PYTHON="2.7"
7-
- PYTHON="3.4"
8-
- PYTHON="3.5"
5+
notifications:
6+
email: false
7+
8+
matrix:
9+
fast_finish: true
10+
include:
11+
- python: 2.7
12+
env: TEST_TARGET=branca_release
13+
- python: 3.4
14+
env: TEST_TARGET=branca_release
15+
- python: 3.5
16+
env: TEST_TARGET=branca_release
17+
allow_failures:
18+
- python: 3.5
19+
env: TEST_TARGET=branca_latest
20+
- python: 3.4
21+
env: TEST_TARGET=branca_latest
22+
- python: 2.7
23+
env: TEST_TARGET=branca_latest
924

1025
before_install:
1126
- wget http://bit.ly/miniconda -O miniconda.sh
1227
- bash miniconda.sh -b -p $HOME/miniconda
1328
- export PATH="$HOME/miniconda/bin:$PATH"
14-
- conda config --add channels ioos -f
1529
- conda update --yes --all
16-
- travis_retry conda create --yes -n test python=$PYTHON nomkl --file requirements.txt
17-
- source activate test
18-
- conda install --yes --file requirements-dev.txt;
19-
- pip install git+https://github.com/python-visualization/branca.git@befdf0bb29ecea488c79147fa1a851e15bfe5a10
20-
- if [[ "$PYTHON" == "3.4" ]]; then
21-
travis_retry conda install --yes nbconvert jupyter_client ipykernel;
22-
conda install --yes -c ioos geopandas;
30+
- conda config --add channels conda-forge --force
31+
- conda create --yes -n TEST python=$TRAVIS_PYTHON_VERSION --file requirements.txt --file requirements-dev.txt
32+
- source activate TEST
33+
34+
- if [[ "$TRAVIS_PYTHON_VERSION" != "3.5" ]]; then
35+
conda install --yes mock ;
2336
fi
24-
- if [[ "$PYTHON" != "3.5" ]]; then
25-
travis_retry conda install --yes mock ;
37+
38+
- if [[ $TEST_TARGET == 'branca_latest' ]]; then
39+
pip install git+https://github.com/python-visualization/branca.git ;
2640
fi
27-
- travis_retry pip install
41+
42+
# Test source distribution.
43+
install:
44+
- python setup.py sdist && version=$(python setup.py --version) && pushd dist && pip install folium-${version}.tar.gz && popd
2845

2946
script:
3047
- python setup.py test

examples/CRS comparison.ipynb

Lines changed: 11 additions & 44 deletions
Large diffs are not rendered by default.

examples/Colormaps.ipynb

Lines changed: 69 additions & 87 deletions
Large diffs are not rendered by default.

examples/Features.ipynb

Lines changed: 33 additions & 228 deletions
Large diffs are not rendered by default.

examples/GeoJSON and choropleth.ipynb

Lines changed: 38 additions & 373 deletions
Large diffs are not rendered by default.

examples/GeoPandas.ipynb

Lines changed: 28 additions & 43 deletions
Large diffs are not rendered by default.

examples/ImageOverlay.ipynb

Lines changed: 20 additions & 23 deletions
Large diffs are not rendered by default.

examples/Popups.ipynb

Lines changed: 25 additions & 40 deletions
Large diffs are not rendered by default.

examples/Quickstart.ipynb

Lines changed: 44 additions & 39 deletions
Large diffs are not rendered by default.

examples/SmoothFactor.ipynb

Lines changed: 4 additions & 21 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)