summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo¶rgen Karlsson <jorgen.w.karlsson@ericsson.com>2016-03-11 12:54:22 +0100
committerqi liang <liangqi1@huawei.com>2016-03-17 08:34:28 +0000
commitb174198a6fc234b835a49c511112b471beecf32a (patch)
tree8de756ad451e293e3111bcc5c23211cf02e91ded
parentbc63c492a8a321c898ad265a54061571d4bd269f (diff)
Update setup.py and dependencies
Fixes dependency problem with python-openstackclient Freezes requirements to use latest/current upstream versions Yardstick can be installed with: $ python setup.py install or with: $ easy_install -U pip $ pip install -r ci/requirements.txt $ pip install . (or for develop mode: pip install -e .) if fixed package versions are required Change-Id: I9cb44d29011509c9c388dc2e7dc8bb60ee25e790 JIRA:- Signed-off-by: Jo¶rgen Karlsson <jorgen.w.karlsson@ericsson.com> (cherry picked from commit bce1f77ef610e3e7997a547704c96cfbdc544cc1)
-rw-r--r--README.rst2
-rw-r--r--ci/requirements.txt44
-rwxr-xr-xci/yardstick-verify2
-rwxr-xr-xsetup.py2
4 files changed, 26 insertions, 24 deletions
diff --git a/README.rst b/README.rst
index d1e403a27..36d3d2563 100644
--- a/README.rst
+++ b/README.rst
@@ -86,10 +86,10 @@ Example setup known to work for development and test:
Install dependencies:
$ sudo apt-get install python-virtualenv python-dev libffi-dev libssl-dev libxml2-dev libxslt1-dev
-$ sudo easy_install -U setuptools
Create a virtual environment:
$ virtualenv ~/yardstick_venv
$ source ~/yardstick_venv/bin/activate
+$ easy_install -U setuptools
$ python setup.py develop
diff --git a/ci/requirements.txt b/ci/requirements.txt
index a92aabd52..4d1a16993 100644
--- a/ci/requirements.txt
+++ b/ci/requirements.txt
@@ -10,64 +10,66 @@
appdirs==1.4.0
Babel==2.2.0
backport-ipaddress==0.1
-cliff==1.16.0
+cliff==2.0.0
cmd2==0.6.8
coverage==4.1b2
debtcollector==1.3.0
ecdsa==0.13
extras==0.0.3
fixtures==1.4.0
-flake8==2.5.2
+flake8==2.5.4
funcsigs==0.4
functools32==3.2.3.post2
-futures==3.0.4
+futures==3.0.5
iso8601==0.1.11
Jinja2==2.8
-jsonpatch==1.12
+jsonpatch==1.13
jsonpointer==1.10
jsonschema==2.5.1
-keystoneauth1==2.2.0
+keystoneauth1==2.3.0
linecache2==1.0.0
lxml==3.5.0
MarkupSafe==0.23
mccabe==0.4.0
mock==1.3.0
-monotonic==0.6
+monotonic==1.0
msgpack-python==0.4.7
netaddr==0.7.18
netifaces==0.10.4
nose==1.3.7
-os-client-config==1.14.0
-oslo.config==3.5.0
-oslo.i18n==3.3.0
-oslo.serialization==2.3.0
-oslo.utils==3.5.0
+openstacksdk==0.8.1
+os-client-config==1.16.0
+oslo.config==3.9.0
+oslo.i18n==3.4.0
+oslo.serialization==2.4.0
+oslo.utils==3.7.0
paramiko==1.16.0
pbr==1.8.1
pep8==1.7.0
+positional==1.0.1
prettytable==0.7.2
pycrypto==2.6.1
pyflakes==1.0.0
pyparsing==2.1.0
pyrsistent==0.11.12
-python-cinderclient==1.5.0
-python-glanceclient==1.1.0
-python-heatclient==0.9.0
-python-keystoneclient==2.1.2
+python-cinderclient==1.6.0
+python-glanceclient==2.0.0
+python-heatclient==1.0.0
+python-keystoneclient==2.3.1
python-mimeparse==1.5.1
-python-neutronclient==4.0.0
-python-novaclient==3.2.0
-python-openstackclient==2.0.0
+python-neutronclient==4.1.1
+python-novaclient==3.3.0
+python-openstackclient==2.2.0
python-subunit==1.2.0
-python-swiftclient==2.7.0
+python-swiftclient==3.0.0
pytz==2015.7
PyYAML==3.11
requests==2.9.1
requestsexceptions==1.1.3
scp==0.10.2
-simplejson==3.8.1
+simplejson==3.8.2
six==1.10.0
-stevedore==1.11.0
+stevedore==1.12.0
testrepository==0.0.20
testtools==2.0.0
traceback2==1.4.0
diff --git a/ci/yardstick-verify b/ci/yardstick-verify
index 875b01ff2..c7b1cefec 100755
--- a/ci/yardstick-verify
+++ b/ci/yardstick-verify
@@ -341,7 +341,7 @@ main()
echo
echo "Checking for External network:"
- for net in $(neutron net-list --router:external -c name -f value); do
+ for net in $(neutron net-list --router:external True -c name -f value); do
echo " external network: $net"
done
diff --git a/setup.py b/setup.py
index 6df0e17f2..31d23de3a 100755
--- a/setup.py
+++ b/setup.py
@@ -28,7 +28,7 @@ setup(
"lxml",
"PyYAML>=3.10",
"pbr<2.0,>=1.3",
- "python-openstackclient<=2.0.0",
+ "python-openstackclient>=2.1.0",
"python-glanceclient>=0.12.0",
"python-heatclient>=0.2.12",
"python-keystoneclient>=0.11.1",