Merge "Update to charm-tools >= 2.0.0"

2016-03-23 12:22:35 +00:00 · 2016-03-23 12:22:35 +00:00 · 7d7c690920
commit 7d7c690920
parent c5e6b1d277 f4dfe12f48
2 changed files with 3 additions and 2 deletions
--- a/test-requirements.txt
+++ b/test-requirements.txt
@ -5,4 +5,5 @@ coverage>=3.6
 mock>=1.2
 flake8>=2.2.4,<=2.4.1
 os-testr>=0.4.1
-charm-tools
+charm-tools>=2.0.0
+requests==2.6.0
--- a/tox.ini
+++ b/tox.ini
@ -19,7 +19,7 @@ basepython = python2.7
 deps = -r{toxinidir}/requirements.txt
       -r{toxinidir}/test-requirements.txt
 commands = flake8 {posargs} hooks unit_tests tests actions
-           charm proof
+           charm-proof

 [testenv:venv]
 commands = {posargs}