Merge branch 'master' into paralog

ClimateImpactLab · May 12, 2017 · 22b3a4b · 22b3a4b
2 parents c8c1c49 + 727a34e
commit 22b3a4b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -1,2 +1,2 @@
-datafs==0.7.0
+datafs==0.7.1
 metacsv==0.0.16
diff --git a/requirements_conda.txt b/requirements_conda.txt
@@ -7,4 +7,4 @@ numba==0.32.0
 blaze==0.10.1
 scipy==0.19.0
 bottleneck==1.2.0
-dask==0.14.1
+dask==0.14.3
diff --git a/requirements_test.txt b/requirements_test.txt
@@ -4,8 +4,8 @@ pip==9.0.1
 wheel==0.29.0
 flake8==3.3.0
 tox==2.7.0
-coverage==4.3.4
+coverage==4.4
 pytest==3.0.7
-pytest_cov==2.4.0
+pytest-cov==2.5.1
 pytest-runner==2.11.1
 coveralls==1.1