From 6c2484960722bb9193529f42eb1b81c881607341 Mon Sep 17 00:00:00 2001
From: Billy Olsen <billy.olsen@gmail.com>
Date: Tue, 15 Mar 2016 20:09:07 -0700
Subject: [PATCH] Use tox in Makefile targets

Modify the Makefile to point at the appropriate tox targets
so that tox and Make output can be equivalent. This involves
mapping the lint target to the pep8 target and the test target
to the py27 target.

Change-Id: I9dd0998ef410bdd725ec0cfde1f94379bd38b060
---
 Makefile | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 464a10cf..bfb9f603 100644
--- a/Makefile
+++ b/Makefile
@@ -2,14 +2,11 @@
 PYTHON := /usr/bin/env python
 
 lint:
-	@flake8 --exclude hooks/charmhelpers,tests/charmhelpers \
-        actions hooks unit_tests tests
-	@charm proof
+	@tox -e pep8
 
 test:
-	@# Bundletester expects unit tests here
 	@echo Starting tests...
-	@$(PYTHON) /usr/bin/nosetests -v --nologcapture --with-coverage unit_tests
+	@tox -e py27
 
 functional_test:
 	@echo Starting Amulet tests...