summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYujun Zhang <zhang.yujunz@zte.com.cn>2017-09-21 08:02:33 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-09-21 08:02:33 +0000
commit3d3a0daa625c17d20f746c056930a00e6278a2f8 (patch)
treefce2ae3a63572ebda410100b9bea999bb137b520
parent0afcb901da65e76f42d908633d84a7e408c1d8a0 (diff)
parent95a01636a7c6c0a17c950367309cab721b2868a7 (diff)
Merge "Freeze requirements for Euphrates" into stable/euphrates
-rw-r--r--requirements-frozen.txt19
-rw-r--r--requirements.txt5
-rw-r--r--tox.ini2
3 files changed, 14 insertions, 12 deletions
diff --git a/requirements-frozen.txt b/requirements-frozen.txt
index 0355eb3c..f9225232 100644
--- a/requirements-frozen.txt
+++ b/requirements-frozen.txt
@@ -1,10 +1,13 @@
-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
+humanfriendly==4.4.1
+connexion==1.1.11
+Jinja2==2.9.6
+Django==1.11.5
+asq==1.2.1
+six==1.11.0
+ansible==2.4.0.0
+requests==2.18.4
prettytable==0.7.2
-six==1.10.0
+numpy==1.13.1
+click==6.7
+pbr==3.1.1
PyYAML==3.12
diff --git a/requirements.txt b/requirements.txt
index 3b1d7498..97229c29 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,14 +1,13 @@
-colorama
ansible
click
connexion<=1.1.11
Jinja2
numpy
-paramiko
pbr
prettytable
six
PyYAML
humanfriendly
asq
-Django \ No newline at end of file
+Django
+requests
diff --git a/tox.ini b/tox.ini
index 42c6fa09..e5fe6e4e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -38,7 +38,7 @@ builtins = _
exclude = build,dist,doc,legacy,.eggs,.git,.tox,.venv
[testenv:reqs]
-deps=-rrequirements/test.txt
+deps=-rrequirements-test.txt
commands=
pip-missing-reqs qtip
pip-extra-reqs qtip