From 6242db9fb1798a8cdf27c7bba277c846092c103f Mon Sep 17 00:00:00 2001
From: yong sheng gong <gong.yongsheng@99cloud.net>
Date: Fri, 13 Nov 2015 15:02:14 +0000
Subject: [PATCH] Update requirements according to global requirements

This is important because if we install tacker along with
other openstack components, this inconsistency will break
system.

Due to the upgrade of hacking, current codes violate many
new rules. These violations will be fixed in follow up
patches.

Author:    yong sheng gong <gong.yongsheng@99cloud.net>
Change-Id: Ib30d31ca804aebf43c02eb8247c718ab00629f6f
Closes-bug: 1516045
---
 requirements.txt      | 17 ++++++++++-------
 setup.py              |  3 +--
 test-requirements.txt | 15 ++++++++++-----
 tox.ini               |  8 +++++++-
 4 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index c09cd7b..b231b5f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,10 +1,13 @@
-pbr>=0.6,!=0.7,<1.0
+# The order of packages is significant, because pip processes them in the order
+# of appearance. Changing the order has an impact on the overall integration
+# process, which may cause wedges in the gate later.
+pbr>=1.6
 argparse
-cliff>=1.4.3
+cliff>=1.14.0 # Apache-2.0
 iso8601>=0.1.9
-netaddr>=0.7.6
-requests>=1.1
-python-keystoneclient>=0.9.0
-simplejson>=2.0.9
-six>=1.6.0
+netaddr!=0.7.16,>=0.7.12
+requests!=2.8.0,>=2.5.2
+python-keystoneclient!=1.8.0,>=1.6.0
+simplejson>=2.2.0
+six>=1.9.0
 Babel>=1.3
diff --git a/setup.py b/setup.py
index 7363757..782bb21 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -26,5 +25,5 @@ except ImportError:
     pass
 
 setuptools.setup(
-    setup_requires=['pbr'],
+    setup_requires=['pbr>=1.8'],
     pbr=True)
diff --git a/test-requirements.txt b/test-requirements.txt
index 402590b..c6642e8 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,11 +1,16 @@
-hacking>=0.8.0,<0.9
-
+# The order of packages is significant, because pip processes them in the order
+# of appearance. Changing the order has an impact on the overall integration
+# process, which may cause wedges in the gate later.
+hacking>=0.10.2,<0.11
 cliff-tablib>=1.0
 coverage>=3.6
 discover
-fixtures>=0.3.14
+fixtures>=1.3.1
 mox>=0.5.3
+flake8>=2.2.4,<=2.4.1
+pep8==1.5.7
+pyflakes==0.8.1
 python-subunit>=0.0.18
-sphinx>=1.1.2,<1.2
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
 testrepository>=0.0.18
-testtools>=0.9.34
+testtools>=1.4.0
diff --git a/tox.ini b/tox.ini
index b7a2a79..1ed6575 100644
--- a/tox.ini
+++ b/tox.ini
@@ -30,6 +30,12 @@ downloadcache = ~/cache/pip
 [flake8]
 # E125 continuation line does not distinguish itself from next logical line
 # H302 import only modules
-ignore = E125,H302
+# H105 Don't use author tags
+# H405 multi line docstring summary not separated with an empty line
+# E265 block comment should start with '# '
+# H238 old style class declaration, use new style (inherit from `object`)
+# E129 visually indented line with same indent as next logical line
+# E113 unexpected indentation
+ignore = E125,H302,H105,H405,E265,H238,E129,E113
 show-source = true
 exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,tools