Updated from global requirements

Change-Id: If137689e5b9008c51cea16d41e648f0df490a247

requirements.txt

@@ -1,10 +1,9 @@
-d2to1>=0.2.10,<0.3
+pbr>=0.5.21,<1.0
-pbr>=0.5,<0.6
 argparse
 iso8601>=0.1.4
-prettytable>=0.6,<0.8
+PrettyTable>=0.6,<0.8
-requests>=0.8.8
+requests>=1.1
-simplejson
+simplejson>=2.0.9
 six
 oslo.config>=1.1.0
 netaddr

setup.py

@@ -14,8 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
 import setuptools
 
 setuptools.setup(
-    setup_requires=['d2to1>=0.2.10,<0.3', 'pbr>=0.5,<0.6'],
+    setup_requires=['pbr>=0.5.21,<1.0'],
-    d2to1=True)
+    pbr=True)

test-requirements.txt

@@ -1,18 +1,15 @@
-# Install bounded pep8/pyflakes first, then let flake8 install
+hacking>=0.5.6,<0.7
-pep8==1.4.5
-pyflakes==0.7.2
-flake8==2.0
-hacking>=0.5.3,<0.6
-coverage
-discover
-fixtures
-keyring
-mock
-mox
-pycrypto
-sphinx>=1.1.2
-testrepository>=0.0.13
-testtools>=0.9.22
-WebOb>=1.0.8
 
-Babel
+coverage>=3.6
+discover
+fixtures>=0.3.12
+keyring>=1.6.1
+mock>=0.8.0
+mox>=0.5.3
+pycrypto>=2.6
+sphinx>=1.1.2
+testrepository>=0.0.17
+testtools>=0.9.32
+WebOb>=1.2.3,<1.3
+
+Babel>=0.9.6

tox.ini

@@ -30,12 +30,13 @@ downloadcache = ~/cache/pip
 # F811: redefinition of unused 'client' from line 81
 # F821: undefined name
 # F841: local variable is assigned to but never used
+# H102: missing copyright header
 # H201: no 'except:' at least use 'except Exception:'
 # H202: assertRaises Exception too broad
 # H302: import only modules
 # H304: no relative imports
 # H404: multi line docstring should start with a summary
 # H802: git commit title
-ignore = F811,F821,F841,H201,H202,H302,H304,H404,H802
+ignore = F811,F821,F841,H102,H201,H202,H302,H304,H404,H802
 show-source = True
 exclude = .venv,.tox,dist,doc,*egg,build