Merge branch 'master' into pyup-update-numpy-1.13.1-to-1.13.2

ClimateImpactLab · Sep 29, 2017 · 890c366 · 890c366
2 parents 07054d4 + 176c479
commit 890c366
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/requirements_conda.txt b/requirements_conda.txt
@@ -1,10 +1,10 @@
 numpy==1.13.2
-netcdf4==1.2.9
+netcdf4==1.3.0
 pandas==0.20.3
 xarray==0.9.6
 h5py==2.7.1
 numba==0.35.0
 blaze==0.10.1
 scipy==0.19.1
 bottleneck==1.2.1
-dask==0.15.2
+dask==0.15.3
diff --git a/requirements_test.txt b/requirements_test.txt
@@ -1,4 +1,4 @@
-Sphinx==1.6.3
+Sphinx==1.6.4
 sphinx-rtd-theme==0.2.5b1
 pip==9.0.1
 wheel==0.30.0
@@ -7,5 +7,5 @@ tox==2.8.2
 coverage==4.4.1
 pytest==3.2.2
 pytest-cov==2.5.1
-pytest-runner==2.11.1
+pytest-runner==2.12.1
 coveralls==1.2.0