diff options
| author |   Cedric Ollivier <cedric.ollivier@orange.com> | 2017-09-01 18:27:50 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-09-01 18:27:50 +0000 |
| commit | 1f3c5d14a1185bdff4dbc66b84d64e06f4626589 (patch) | |
| tree | e66e2474f0f790a11e4923325ea1d81d1b8ee668 | |
| parent | d9c60d672e04c499bde75d8a98e1e235e6374baf (diff) | |
| parent | 5452a35e4507269d0cf024bf7234fffbdbf35d6f (diff) | |
Merge "Add all missing dependencies"
| -rw-r--r-- | requirements.txt | 11 | ||||
| -rw-r--r-- | upper-constraints.txt | 4 |
2 files changed, 10 insertions, 5 deletions
diff --git a/requirements.txt b/requirements.txt index afd5305d2..75e264c38 100644 --- a/requirements.txt +++ b/requirements.txt @@ -19,7 +19,7 @@ dnspython>=1.14.0;python_version=='2.7' # http://www.dnspython.org/LICENSE dnspython3!=1.13.0,!=1.14.0,>=1.12.0;python_version>='3.0' # http://www.dnspython.org/LICENSE click openbaton-cli -cloudify_rest_client +cloudify-rest-client Flask!=0.11,<1.0,>=0.10 # BSD Flask-RESTful>=0.3.5 # BSD IPy @@ -30,5 +30,10 @@ six>=1.9.0 # MIT opnfv snaps tempest>=12.1.0 # Apache-2.0 -openstack_requirements -SQLAlchemy +openstack-requirements +SQLAlchemy<1.1.0,>=1.0.10 # MIT +paramiko>=2.0 # LGPLv2.1+ +Jinja2!=2.9.0,!=2.9.1,!=2.9.2,!=2.9.3,!=2.9.4,>=2.8 # BSD License (3 clause) +urllib3>=1.15.1 # MIT +oslo.serialization>=1.10.0 # Apache-2.0 +oslo.utils>=3.18.0 # Apache-2.0 diff --git a/upper-constraints.txt b/upper-constraints.txt index 2c5cd315d..98d7c55f5 100644 --- a/upper-constraints.txt +++ b/upper-constraints.txt @@ -6,7 +6,7 @@ git+https://gerrit.opnfv.org/gerrit/securityscanning#egg=securityscanning git+https://gerrit.opnfv.org/gerrit/sfc#egg=sfc -e git+https://gerrit.opnfv.org/gerrit/promise#egg=promise -e git+https://github.com/openstack/refstack-client#egg=refstack-client -cloudify_rest_client===4.0 +cloudify-rest-client===4.0 iniparse===0.4 openbaton-cli===2.2.1b7 robotframework===3.0.2 @@ -14,4 +14,4 @@ robotframework-httplibrary===0.4.2 robotframework-requests===0.4.7 robotframework-sshlibrary===2.1.3;python_version=='2.7' IPy===0.83 --e git+https://github.com/openstack/requirements@stable/ocata#egg=openstack_requirements +-e git+https://github.com/openstack/requirements@stable/ocata#egg=openstack-requirements |