From 76203fe5181232029feb174f7d949f51379c2eb1 Mon Sep 17 00:00:00 2001
From: BK Box <bk@theboxes.org>
Date: Wed, 19 Mar 2014 08:54:26 -0500
Subject: [PATCH] Install python-novaclient 2.15.0 and newer on PY3

All versions before 2.15.0 are not compatible with python 3.3. This
change will restrict to that version or newer for python 3 only. PBR
will look at requirements-py3.txt, if present, and install a newer version
of python-novaclient.

Change-Id: I00298dcd2e479f0683bf7884e68e88912a5cb1b7
Implements: blueprint relaxed-novaclient-version
---
 requirements-py3.txt | 10 ++++++++++
 requirements.txt     |  2 +-
 tox.ini              |  9 ++++++++-
 3 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 requirements-py3.txt

diff --git a/requirements-py3.txt b/requirements-py3.txt
new file mode 100644
index 0000000..bf76134
--- /dev/null
+++ b/requirements-py3.txt
@@ -0,0 +1,10 @@
+iso8601>=0.1.9
+Jinja2
+# python3 branch of paramiko
+https://github.com/paramiko/paramiko/archive/python3.zip#egg=paramiko-1.13.0
+pbr>=0.5.21,<1.0
+python-novaclient>=2.15.0
+# pythonwhois with python 3.3 readiness patch
+-e git://github.com/ziadsawalha/python-whois.git@17aa17c1c71805df1cb7fa053fe90b6dc9ba6d4b#egg=pythonwhois
+six==1.5.2
+tldextract==1.3.1
diff --git a/requirements.txt b/requirements.txt
index 218cf1c..1c6cc02 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,7 +3,7 @@ Jinja2
 # python3 branch of paramiko
 https://github.com/paramiko/paramiko/archive/python3.zip#egg=paramiko-1.13.0
 pbr>=0.5.21,<1.0
-python-novaclient==2.15.0
+python-novaclient>=2.6.0.1
 # pythonwhois with python 3.3 readiness patch
 -e git://github.com/ziadsawalha/python-whois.git@17aa17c1c71805df1cb7fa053fe90b6dc9ba6d4b#egg=pythonwhois
 six==1.5.2
diff --git a/tox.ini b/tox.ini
index 376b639..28edfe2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,11 +6,18 @@ skipdist = True
 [testenv]
 usedevelop = True
 install_command = pip install -U {opts} {packages}
-setenv = VIRTUAL_ENV={envdir}
+setenv =
+   VIRTUAL_ENV={envdir}
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 commands = python setup.py testr --testr-args='{posargs}'
 
+[testenv:py26]
+setenv =
+   VIRTUAL_ENV={envdir}
+   CFLAGS=-Qunused-arguments
+   CPPFLAGS=-Qunused-arguments
+
 [testenv:pep8]
 commands = flake8