Merge branch 'develop' into pyup-update-h5py-2.7.1-to-2.8.0

JaneliaSciComp · Jun 13, 2018 · 53331f3 · 53331f3
2 parents 72cb0ad + 2978259
commit 53331f3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -1,7 +1,7 @@
 bumpversion==0.5.3
 h5py==2.8.0
-numpy==1.14.3
-pytest==3.6.0
+numpy==1.14.5
+pytest==3.6.1
 pytest-pep8==1.0.6
 pytest-cov==2.5.1
 coveralls==1.3.0
diff --git a/requirements.txt b/requirements.txt
@@ -1,2 +1,2 @@
 h5py==2.8.0
-numpy==1.14.3
+numpy==1.14.5