From 067db13a5a0c85a275b65655d588a41269038799 Mon Sep 17 00:00:00 2001 From: Dmitry Tantsur Date: Mon, 16 Feb 2015 17:23:42 +0100 Subject: [PATCH] Getting ready for inclusion into projects.yaml * Switch from docutils to doc8 for checking docs * Split away plugin-requirements * Update to Kilo Change-Id: Icf1411bd80aa7870996b5536b0ac1aec96783dab --- MANIFEST.in | 1 + plugin-requirements.txt | 1 + requirements.txt | 5 ++++- test-requirements.txt | 15 +++++++-------- tox.ini | 6 ++++-- 5 files changed, 17 insertions(+), 11 deletions(-) create mode 100644 plugin-requirements.txt diff --git a/MANIFEST.in b/MANIFEST.in index dba83ee24..92b782c58 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -3,6 +3,7 @@ include LICENSE include ironic-discoverd.8 include requirements.txt include test-requirements.txt +include plugin-requirements.txt include tox.ini include *.rst recursive-include functest * diff --git a/plugin-requirements.txt b/plugin-requirements.txt new file mode 100644 index 000000000..dfd385996 --- /dev/null +++ b/plugin-requirements.txt @@ -0,0 +1 @@ +hardware>=0.7,<0.99 diff --git a/requirements.txt b/requirements.txt index d7a4fb0b6..208d0fa24 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,10 @@ +# 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. eventlet>=0.16.1 Flask>=0.10,<1.0 python-ironicclient>=0.2.1 -python-keystoneclient>=1.0.0 +python-keystoneclient>=1.1.0 requests>=2.2.0,!=2.4.0 six>=1.7.0 stevedore>=1.1.0 diff --git a/test-requirements.txt b/test-requirements.txt index 58821ce14..cc4cecc5a 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,8 +1,7 @@ -# generic -coverage -docutils -hacking -mock - -# plugin-specific -hardware>=0.7,<0.99 +# 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 +doc8 # Apache-2.0 +hacking>=0.10.0,<0.11 +mock>=1.0 diff --git a/tox.ini b/tox.ini index 0f9cf2651..45648911a 100644 --- a/tox.ini +++ b/tox.ini @@ -6,6 +6,7 @@ usedevelop = True deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt + -r{toxinidir}/plugin-requirements.txt commands = coverage run --branch --include "ironic_discoverd*" -m unittest discover ironic_discoverd.test coverage report -m --fail-under 90 @@ -16,10 +17,10 @@ basepython = python2.7 deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt + -r{toxinidir}/plugin-requirements.txt commands = flake8 ironic_discoverd - rst2html.py --strict README.rst /dev/null - rst2html.py --strict CONTRIBUTING.rst /dev/null + doc8 README.rst CONTRIBUTING.rst [flake8] max-complexity=15 @@ -32,5 +33,6 @@ basepython = python2.7 deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt + -r{toxinidir}/plugin-requirements.txt commands = python functest/run.py