Skip to content

Commit 82496b7

Browse files
committed
Split branca test
1 parent eb51514 commit 82496b7

File tree

2 files changed

+25
-12
lines changed

2 files changed

+25
-12
lines changed

.travis.yml

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,41 @@ language: python
22

33
sudo: false
44

5+
python:
6+
- 2.7
7+
- 3.4
8+
- 3.5
9+
510
env:
6-
- PYTHON="2.7"
7-
- PYTHON="3.4"
8-
- PYTHON="3.5"
11+
- TEST_TARGET=branca_release
12+
- TEST_TARGET=branca_latest
913

1014
before_install:
1115
- wget http://bit.ly/miniconda -O miniconda.sh
1216
- bash miniconda.sh -b -p $HOME/miniconda
1317
- export PATH="$HOME/miniconda/bin:$PATH"
14-
- conda config --add channels ioos -f
18+
- conda config --add channels conda-forge -f
1519
- 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
20+
- travis_retry conda create --yes -n TEST python=$TRAVIS_PYTHON_VERSION --file requirements.txt
21+
- source activate TEST
22+
# Development dependencies.
23+
- travis_retry conda install --yes --file requirements-dev.txt
24+
25+
- if [[ "$TRAVIS_PYTHON_VERSION" == "3.4" ]]; then
2126
travis_retry conda install --yes nbconvert jupyter_client ipykernel;
22-
conda install --yes -c ioos geopandas;
27+
conda install --yes -c conda-forge geopandas;
2328
fi
24-
- if [[ "$PYTHON" != "3.5" ]]; then
29+
- if [[ "$TRAVIS_PYTHON_VERSION" != "3.5" ]]; then
2530
travis_retry conda install --yes mock ;
2631
fi
27-
- travis_retry pip install
32+
33+
- if [[ $TEST_TARGET == 'branca_latest' ]]; then
34+
pip install git+https://github.com/python-visualization/branca.git ;
35+
fi
36+
37+
# Test source distribution.
38+
install:
39+
- python setup.py sdist && version=$(python setup.py --version) && pushd dist && pip install folium-${version}.tar.gz && popd
2840

2941
script:
3042
- python setup.py test

requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
Jinja2
2+
branca

0 commit comments

Comments
 (0)