diff options
| author | Jarrod Millman <jarrod.millman@gmail.com> | 2018-07-11 16:34:03 -0700 |
|---|---|---|
| committer | Jarrod Millman <jarrod.millman@gmail.com> | 2018-08-08 01:55:32 -0700 |
| commit | bdba37e89e4e722e528e805b201505115231dd43 (patch) | |
| tree | b0c563d3f25c7a13c53f7b3fc5423f0a6525815b | |
| parent | 023f2a640e7c3bdf2fb5d45c13af8637e4058c1b (diff) | |
| download | networkx-bdba37e89e4e722e528e805b201505115231dd43.tar.gz | |
More fixes
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rw-r--r-- | requirements/extras.txt | 2 | ||||
| -rwxr-xr-x | tools/travis/osx_install.sh | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 924fa3df..e2a670c3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -69,15 +69,15 @@ matrix: - libgdal-dev - graphviz - os: osx - osx_image: xcode9.4 + osx_image: xcode9.3 language: generic env: - - TRAVIS_PYTHON_VERSION=3.6.0 + - TRAVIS_PYTHON_VERSION=3.7.0 - OPTIONAL_DEPS=1 - OSX_PKG_ENV=miniconda - os: osx language: generic - env: TRAVIS_PYTHON_VERSION=3.6 + env: TRAVIS_PYTHON_VERSION=3.7 - python: 2.7 - python: 3.5 - python: 3.6 diff --git a/requirements/extras.txt b/requirements/extras.txt index 43f7abf5..77239183 100644 --- a/requirements/extras.txt +++ b/requirements/extras.txt @@ -3,7 +3,7 @@ scipy>=1.1.0 pandas>=0.23.3 matplotlib>=2.2.2 pygraphviz>=1.3.1 -pydot>=1.2.3 +pydot>=1.2.4 pyyaml>=3.13 lxml>=4.2.3 gdal==1.10.0 diff --git a/tools/travis/osx_install.sh b/tools/travis/osx_install.sh index e5f13bcc..04df32a5 100755 --- a/tools/travis/osx_install.sh +++ b/tools/travis/osx_install.sh @@ -29,7 +29,7 @@ if [[ "${OPTIONAL_DEPS}" == 1 ]]; then brew install graphviz fi dot -V - sed -i "" 's/^gdal.*/gdal==2.3.0/' requirements/extras.txt + sed -i "" 's/^gdal.*/gdal==1.11.2/' requirements/extras.txt fi set +ex |