From 9e4d243f1360158555fe92cc35fae6521bfdfce5 Mon Sep 17 00:00:00 2001 From: Yujun Zhang Date: Wed, 29 Mar 2017 14:06:06 +0800 Subject: [PATCH] Reorganize requirements - move test-requirements to ./requirements/test - freeze requirements in ./requirements/frozen{,-test}.txt - add necessary packages for requirements checking Change-Id: I451e75bd0d9654ab37940336145cf3b4d0e365fe Signed-off-by: Yujun Zhang --- requirements-frozen.txt | 10 ++++++++++ test-requirements.txt => requirements-test.txt | 4 ++-- requirements.txt | 8 +++++--- tox.ini | 5 +++-- 4 files changed, 20 insertions(+), 7 deletions(-) create mode 100644 requirements-frozen.txt rename test-requirements.txt => requirements-test.txt (97%) diff --git a/requirements-frozen.txt b/requirements-frozen.txt new file mode 100644 index 00000000..0355eb3c --- /dev/null +++ b/requirements-frozen.txt @@ -0,0 +1,10 @@ +ansible==2.1.2.0 +click==6.7 +connexion==1.1.5 +Jinja2==2.9.5 +numpy==1.12.1 +paramiko==2.1.2 +pbr==2.0.0 +prettytable==0.7.2 +six==1.10.0 +PyYAML==3.12 diff --git a/test-requirements.txt b/requirements-test.txt similarity index 97% rename from test-requirements.txt rename to requirements-test.txt index 24405245..1d627319 100644 --- a/test-requirements.txt +++ b/requirements-test.txt @@ -3,10 +3,10 @@ # process, which may cause wedges in the gate later. mock -pip_check_reqs pykwalify pytest pytest-cov pytest-faker pytest-mock -tox +pip_check_reqs +pipreqs diff --git a/requirements.txt b/requirements.txt index d00b3cf1..b0926b56 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,10 @@ +ansible click -pyyaml -paramiko connexion +Jinja2 numpy +paramiko pbr -ConfigParser prettytable +six +PyYAML diff --git a/tox.ini b/tox.ini index 935c4d71..c758183f 100644 --- a/tox.ini +++ b/tox.ini @@ -12,7 +12,7 @@ usedevelop = True install_command = pip install -U {opts} {packages} deps = -rrequirements.txt - -rtest-requirements.txt + -rrequirements-test.txt commands= py.test \ --basetemp={envtmpdir} \ @@ -38,10 +38,11 @@ builtins = _ exclude = build,dist,doc,legacy,.eggs,.git,.tox,.venv [testenv:reqs] -deps=-rtest-requirements.txt +deps=-rrequirements/test.txt commands= pip-missing-reqs qtip pip-extra-reqs qtip + pipreqs qtip --savepath requirements-frozen.txt [pytest] testpaths = tests -- 2.16.6