From c15f9d7232712faff208001538552750f69c3649 Mon Sep 17 00:00:00 2001
From: Greg Blumberg <wblumberg@ou.edu>
Date: Sun, 1 Dec 2019 10:52:45 -0500
Subject: [PATCH] Bumped up numpy version to 1.17 in travis and >=1.15 in .yml

---
 .travis.yml     | 6 +++---
 environment.yml | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 50592416..1367ec03 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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: 
diff --git a/environment.yml b/environment.yml
index 984e54a2..d00ef800 100644
--- a/environment.yml
+++ b/environment.yml
@@ -5,8 +5,8 @@ channels:
   - anaconda
 dependencies:
   - python=3
-  - numpy=1.15.*
-  - pyside2=5.12.*
+  - numpy>=1.15
+  - pyside2>=5.12
   - sphinx
   - pytest
   - qtpy