From 6a31d594826f948df0a1ca32d38337c9edd57187 Mon Sep 17 00:00:00 2001 From: James Page Date: Thu, 18 Feb 2016 10:16:25 +0000 Subject: [PATCH] [trivial] Normalize tox config --- requirements.txt | 12 ++++++++++++ requirements/requirements-precise.txt | 6 ------ requirements/requirements-trusty.txt | 6 ------ requirements/test-requirements.txt | 7 ------- test-requirements.txt | 8 ++++++++ tox.ini | 18 ++++++------------ 6 files changed, 26 insertions(+), 31 deletions(-) create mode 100644 requirements.txt delete mode 100644 requirements/requirements-precise.txt delete mode 100644 requirements/requirements-trusty.txt delete mode 100644 requirements/test-requirements.txt create mode 100644 test-requirements.txt diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 00000000..db0dfb3b --- /dev/null +++ b/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 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/requirements-trusty.txt b/requirements/requirements-trusty.txt deleted file mode 100644 index e292ca25..00000000 --- a/requirements/requirements-trusty.txt +++ /dev/null @@ -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 diff --git a/requirements/test-requirements.txt b/requirements/test-requirements.txt deleted file mode 100644 index ffefe42b..00000000 --- a/requirements/test-requirements.txt +++ /dev/null @@ -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 diff --git a/test-requirements.txt b/test-requirements.txt new file mode 100644 index 00000000..3af44d73 --- /dev/null +++ b/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 diff --git a/tox.ini b/tox.ini index 166ea927..be053f44 100644 --- a/tox.ini +++ b/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