From ab2c851e5c1a0b9e95dbe0f6b5ef793235ef0a51 Mon Sep 17 00:00:00 2001
From: James Page <james.page@ubuntu.com>
Date: Fri, 30 Oct 2015 12:37:15 +0900
Subject: [PATCH] Make things alot simpler

---
 ...requirements-trusty.txt => requirements.txt |  0
 requirements/requirements-precise.txt          |  6 ------
 ...t-requirements.txt => test-requirements.txt |  0
 tox.ini                                        | 18 ++++++------------
 4 files changed, 6 insertions(+), 18 deletions(-)
 rename requirements/requirements-trusty.txt => requirements.txt (100%)
 delete mode 100644 requirements/requirements-precise.txt
 rename requirements/test-requirements.txt => test-requirements.txt (100%)

diff --git a/requirements/requirements-trusty.txt b/requirements.txt
similarity index 100%
rename from requirements/requirements-trusty.txt
rename to requirements.txt
diff --git a/requirements/requirements-precise.txt b/requirements/requirements-precise.txt
deleted file mode 100644
index 21ee7d12..00000000
--- a/requirements/requirements-precise.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-PyYAML==3.10
-simplejson==2.3.2
-netifaces==0.8
-netaddr==0.7.10
-Jinja2==2.6
-six==1.1.0
diff --git a/requirements/test-requirements.txt b/test-requirements.txt
similarity index 100%
rename from requirements/test-requirements.txt
rename to test-requirements.txt
diff --git a/tox.ini b/tox.ini
index e9cf1d53..4e328e48 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,5 @@
 [tox]
-# Default to current LTS
-envlist = lint,py27-trusty
+envlist = lint,py27
 skipsdist = True
 
 [testenv]
@@ -10,20 +9,15 @@ install_command =
   pip install --allow-unverified python-apt {opts} {packages}
 commands = ostestr {posargs}
 
-[testenv:py27-precise]
+[testenv:py27]
 basepython = python2.7
-deps = -r{toxinidir}/requirements/requirements-precise.txt
-       -r{toxinidir}/requirements/test-requirements.txt
-
-[testenv:py27-trusty]
-basepython = python2.7
-deps = -r{toxinidir}/requirements/requirements-trusty.txt
-       -r{toxinidir}/requirements/test-requirements.txt
+deps = -r{toxinidir}/requirements.txt
+       -r{toxinidir}/test-requirements.txt
 
 [testenv:lint]
 basepython = python2.7
-deps = -r{toxinidir}/requirements/requirements-trusty.txt
-       -r{toxinidir}/requirements/test-requirements.txt
+deps = -r{toxinidir}/requirements.txt
+       -r{toxinidir}/test-requirements.txt
 commands = flake8 {posargs} hooks unit_tests tests
            charm proof