Skip to content

Commit cf33770

Browse files
committed
allow failure on dev., nightly, "upgrade" pkgs
1 parent 6815096 commit cf33770

File tree

1 file changed

+10
-12
lines changed

1 file changed

+10
-12
lines changed

.travis.yml

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -61,18 +61,14 @@ matrix:
6161
# pip installs latest stable versions automatically
6262
- python: 2.7
6363
env:
64-
- NUMPY=numpy>=1.10.0
65-
- MPL=matplotlib>=1.5.0
6664
- BUILD_LIBGEOS=3.5.0
6765
- python: 3.5
6866
env:
69-
- NUMPY=numpy>=1.10.0
70-
- MPL=matplotlib>=1.5.0
7167
- BUILD_LIBGEOS=3.5.0
7268

7369
# "current development" environment
7470
# this test is diagnostic for development versions and is not required to pass
75-
- python: "3.5-dev"
71+
- python: "nightly"
7672
env:
7773
# these are python packages so prepend "git+" to git URL
7874
- NUMPY=git+https://github.com/numpy/numpy.git
@@ -82,7 +78,9 @@ matrix:
8278
- BUILD_LIBGEOS=https://github.com/libgeos/libgeos.git
8379
# or download latest stable
8480
# - BUILD_LIBGEOS=3.5.0
85-
81+
82+
allow_failures:
83+
- python: "nightly"
8684

8785
# before_install:
8886
# Install into our own pristine virtualenv
@@ -96,13 +94,13 @@ install:
9694
- pip install --upgrade setuptools
9795

9896
# the development version of numpy requires Cython
99-
- if [[ $TRAVIS_PYTHON_VERSION == '3.5-dev' ]]; then pip install --install-option="--no-cython-compile" Cython; fi
100-
# workaround to get the specified numpy version to install on Python 2.7
101-
- if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then pip install --upgrade $NUMPY; fi
97+
- if [[ $TRAVIS_PYTHON_VERSION == 'nightly' ]]; then pip install --install-option="--no-cython-compile" Cython; fi
98+
99+
# workaround for "middle of the road" configuration to use pre-installed numpy, others "upgrade" numpy
100+
- if [[ $TRAVIS_PYTHON_VERSION != '3.4' ]]; then pip install --upgrade $NUMPY; fi
102101

103-
- pip install $NUMPY
104-
- pip install $MPL
105-
- pip install $PYPROJ
102+
- pip install --upgrade $MPL
103+
- pip install --upgrade $PYPROJ
106104
- pip install -r requirements.txt
107105

108106
# extra requirements to support Python 2.6

0 commit comments

Comments
 (0)