Sync with global requirements

Update to get the same versions in that are used elsewhere.

Version change for: pbr, testtools
Updated ../docs-specs/requirements.txt:
    pbr>=0.6,!=0.7,<1.0            ->   pbr>=1.3,<2.0
    testtools>=0.9.36,!=1.2.0      ->   testtools>=1.4.0

Also, stop specifying requirements.txt in tox.ini.

As PBR already injects the contents of requirements.txt into
setup_requires, there is no need for tox to explicitly install them.
http://lists.openstack.org/pipermail/openstack-dev/2015-July/069663.html

Change-Id: Id4ed6e53bcf199e78a02a5f5d079e2ca45642af4

requirements.txt

@@ -2,10 +2,10 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-pbr>=0.6,!=0.7,<1.0
-doc8  # Apache-2.0
-oslosphinx>=2.5.0  # Apache-2.0
-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
+pbr<2.0,>=1.3
+doc8 # Apache-2.0
+oslosphinx>=2.5.0 # Apache-2.0
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
 testrepository>=0.0.18
-testtools>=0.9.36,!=1.2.0
+testtools>=1.4.0
 yasfb>=0.5.1

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.3'],
     pbr=True)

tox.ini

@@ -7,7 +7,6 @@ skipsdist = True
 usedevelop = True
 setenv = VIRTUAL_ENV={envdir}
 install_command = pip install -U {opts} {packages}
-deps = -r{toxinidir}/requirements.txt
 # The gate jobs run build_sphinx without using tox (thus ignore the
 # docs target) and also call "tox -e py27", thus add doc8 here as
 # default job.