Skip to content

Commit

Permalink
Bumped up numpy version to 1.17 in travis and >=1.15 in .yml
Browse files Browse the repository at this point in the history
  • Loading branch information
Greg Blumberg committed Dec 1, 2019
1 parent ddea6f8 commit c15f9d7
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ matrix:
- os: linux
language: generic
env:
- PYTHON_VERSION="3.6" BUILD_CONDA="YES" NUMPY_VERSION=1.15 DISPLAY_AVAIL="YES"
- PYTHON_VERSION="3.6" BUILD_CONDA="YES" NUMPY_VERSION=1.17 DISPLAY_AVAIL="YES"
- os: osx
language: generic
env:
- PYTHON_VERSION="3.6" DISPLAY_AVAIL="NO" BUILD_DOCS="YES" NUMPY_VERSION=1.15
- PYTHON_VERSION="3.6" DISPLAY_AVAIL="NO" BUILD_DOCS="YES" NUMPY_VERSION=1.17
- os: linux
language: generic
env:
- PYTHON_VERSION="3.6" BUILD_DOCS="NO" NUMPY_VERSION=1.15 COVERALLS="YES" DISPLAY_AVAIL="YES"
- PYTHON_VERSION="3.6" BUILD_DOCS="NO" NUMPY_VERSION=1.17 COVERALLS="YES" DISPLAY_AVAIL="YES"

addons:
ssh_known_hosts:
Expand Down
4 changes: 2 additions & 2 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ channels:
- anaconda
dependencies:
- python=3
- numpy=1.15.*
- pyside2=5.12.*
- numpy>=1.15
- pyside2>=5.12
- sphinx
- pytest
- qtpy
Expand Down

0 comments on commit c15f9d7

Please sign in to comment.