From 92f69b14449e202c3826a65fc5a0c5a97e019e40 Mon Sep 17 00:00:00 2001
From: James Page <james.page@ubuntu.com>
Date: Wed, 23 Mar 2016 08:52:02 +0000
Subject: [PATCH] Update to charm-tools >= 2.0.0

The new release of charm-tools no longer ships the charm
command; update minimum version requirement and switch
to using charm-proof instead, unblocking current pep8
failures across all charms.

Also pin the version of requests to 2.6.0 until theblues
(indirect dependency of charm-tools) sort out its
requirements versioning.

Change-Id: I9ffc23d111d35833dc44fc33a27111bed55b6577
---
 test-requirements.txt | 3 ++-
 tox.ini               | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/test-requirements.txt b/test-requirements.txt
index 3af44d7..4faf254 100644
--- 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
diff --git a/tox.ini b/tox.ini
index e8bf7cf..a4d9c0d 100644
--- 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
-           charm proof
+           charm-proof
 
 [testenv:venv]
 commands = {posargs}