Tweak pbr conf

Mainly, remove the pin in setup.py and remove the hook entry in
setup.cfg. Update from requirements while we're at it.

Change-Id: I34a05229b9ea0bdfd99dc16d09713c9494c1cb78

5 files changed, 6 insertions, 14 deletions

diff --git a/requirements.txt b/requirements.txt
index 69818ab..6dd8f94 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-pbr>=0.5.16,<0.6
+pbr>=0.5.21,<1.0
 argparse
 lxml>=2.3
 PrettyTable>=0.6,<0.8
diff --git a/setup.cfg b/setup.cfg
index b58003d..2d0bbbe 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -17,10 +17,6 @@ classifier =
     Programming Language :: Python :: 2.7
     Programming Language :: Python :: 2.6
 
-[global]
-setup-hooks =
-    pbr.hooks.setup_hook
-
 [files]
 packages =
     troveclient
@@ -35,4 +31,4 @@ source-dir = doc/source
 build-dir = doc/build
 
 [upload_sphinx]
-upload-dir = doc/build/html
\ No newline at end of file
+upload-dir = doc/build/html
diff --git a/setup.py b/setup.py
index 2a0786a..70c2b3f 100755
--- a/setup.py
+++ b/setup.py
@@ -18,5 +18,5 @@
 import setuptools
 
 setuptools.setup(
-    setup_requires=['pbr>=0.5.21,<1.0'],
+    setup_requires=['pbr'],
     pbr=True)
diff --git a/test-requirements.txt b/test-requirements.txt
index e22723c..a944dd1 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,10 +1,6 @@
-# Install bounded pep8/pyflakes first, then let flake8 install
-pep8==1.4.5
-pyflakes==0.7.2
-flake8==2.0
-hacking>=0.5.6,<0.7
+hacking>=0.5.6,<0.8
 discover
 sphinx>=1.1.2
 testrepository>=0.0.17
 testtools>=0.9.32
-mock>=0.8.0
+mock>=1.0
diff --git a/tox.ini b/tox.ini
index 3777b23..f72ad91 100644
--- a/tox.ini
+++ b/tox.ini
@@ -32,6 +32,6 @@ commands = python setup.py testr --coverage --testr-args='{posargs}'
     sphinx-build -b html {toxinidir}/docs/source {envtmpdir}/html
 
 [flake8]
-ignore = E125,F401,F403,F811,F821,F841,H102,H103,H201,H23,H301,H306,H401,H402,H403,H404,H702,H703
+ignore = E125,F401,F403,F811,F821,F841,H102,H103,H201,H202,H23,H301,H306,H401,H402,H403,H404,H702,H703
 show-source = True
 exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build