[trivial] Normalize tox config

requirements.txt

@@ -0,0 +1,12 @@
+# The order of packages is significant, because pip processes them in the order
+# of appearance. Changing the order has an impact on the overall integration
+# process, which may cause wedges in the gate later.
+PyYAML>=3.1.0
+simplejson>=2.2.0
+netifaces>=0.10.4
+netaddr>=0.7.12,!=0.7.16
+Jinja2>=2.6  # BSD License (3 clause)
+six>=1.9.0
+dnspython>=1.12.0
+psutil>=1.1.1,<2.0.0
+python-keystoneclient>=1.6.0,!=1.8.0

requirements/requirements-precise.txt

@@ -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

requirements/requirements-trusty.txt

@@ -1,6 +0,0 @@
-PyYAML>=3.10
-simplejson==3.3.1
-netifaces==0.8
-netaddr==0.7.10
-Jinja2==2.7.2
-six==1.5.2

requirements/test-requirements.txt

@@ -1,7 +0,0 @@
-testtools==0.9.35
-coverage==3.7.1
-mock==1.0.1
-flake8==2.1.0
-# No version required
-charm-tools
-os-testr

test-requirements.txt

@@ -0,0 +1,8 @@
+# The order of packages is significant, because pip processes them in the order
+# of appearance. Changing the order has an impact on the overall integration
+# process, which may cause wedges in the gate later.
+coverage>=3.6
+mock>=1.2
+flake8>=2.2.4,<=2.4.1
+os-testr>=0.4.1
+charm-tools

tox.ini

@@ -1,6 +1,5 @@
 [tox]
-# Default to current LTS
-envlist = pep8,py27-trusty
+envlist = pep8,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:pep8]
 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} actions hooks unit_tests tests
            charm proof