Merge branch 'master' into pyup-update-pytest-runner-2.11-to-2.11.1

ClimateImpactLab · Feb 8, 2017 · 4498e40 · 4498e40
2 parents 1f63fe6 + 063e618
commit 4498e40
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/requirements_test.txt b/requirements_test.txt
@@ -9,7 +9,7 @@ jinja2==2.9.4
 pip==9.0.1
 wheel==0.29.0
 flake8==3.2.1
-tox==2.5.0
+tox==2.6.0
 coverage==4.3.4
 pytest==3.0.6
 pytest_cov==2.4.0