From f529888796f9b13d32a01724c947cab1d5132a17 Mon Sep 17 00:00:00 2001
From: James Page <james.page@ubuntu.com>
Date: Tue, 16 Feb 2016 07:23:02 +0000
Subject: [PATCH] Refactor tox a bit

---
 requirements-precise.txt                    |  6 ------
 requirements-trusty.txt => requirements.txt |  2 +-
 tox.ini                                     | 13 ++++---------
 3 files changed, 5 insertions(+), 16 deletions(-)
 delete mode 100644 requirements-precise.txt
 rename requirements-trusty.txt => requirements.txt (85%)

diff --git a/requirements-precise.txt b/requirements-precise.txt
deleted file mode 100644
index 21ee7d1..0000000
--- a/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-trusty.txt b/requirements.txt
similarity index 85%
rename from requirements-trusty.txt
rename to requirements.txt
index ec7a61a..e292ca2 100644
--- a/requirements-trusty.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-PyYAML==3.10
+PyYAML>=3.10
 simplejson==3.3.1
 netifaces==0.8
 netaddr==0.7.10
diff --git a/tox.ini b/tox.ini
index c851ad7..ac60278 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 # Default to current LTS
-envlist = pep8,py27-trusty
+envlist = pep8,py27
 skipsdist = True
 
 [testenv]
@@ -11,19 +11,14 @@ 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-precise.txt
-       -r{toxinidir}/test-requirements.txt
-
-[testenv:py27-trusty]
-basepython = python2.7
-deps = -r{toxinidir}/requirements-trusty.txt
+deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 
 [testenv:pep8]
 basepython = python2.7
-deps = -r{toxinidir}/requirements-trusty.txt
+deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 commands = flake8 {posargs} hooks unit_tests tests
            charm proof