diff --git a/requirements.txt b/requirements.txt index 5f58139..ec101d7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,10 +1,13 @@ -pbr>=0.5.21,<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>=0.6,!=0.7,<1.0 argparse Babel>=1.3 -iso8601>=0.1.8 -prettytable>=0.6,<0.8 -python-keystoneclient>=0.4.1 -requests>=1.1 -simplejson>=2.0.9 -six>=1.4.1 +iso8601>=0.1.9 +PrettyTable>=0.7,<0.8 +python-keystoneclient>=0.10.0 +requests>=1.2.1,!=2.4.0 +simplejson>=2.2.0 +six>=1.7.0 diff --git a/setup.py b/setup.py index c0a24ea..7363757 100644 --- a/setup.py +++ b/setup.py @@ -14,8 +14,17 @@ # 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 +# In python < 2.7.4, a lazy loading of package `pbr` will break +# setuptools if some other modules registered functions in `atexit`. +# solution from: http://bugs.python.org/issue15881#msg170215 +try: + import multiprocessing # noqa +except ImportError: + pass + setuptools.setup( setup_requires=['pbr'], pbr=True) diff --git a/test-requirements.txt b/test-requirements.txt index 03b2b08..54dc808 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,3 +1,6 @@ +# 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 already pins down pep8, pyflakes and flake8 hacking>=0.9.2,<0.10 @@ -5,7 +8,7 @@ coverage>=3.6 discover fixtures>=0.3.14 mock>=1.0 -sphinx>=1.1.2,<1.2 -sphinxcontrib-pecanwsme>=0.5 -testrepository>=0.0.17 -testtools>=0.9.32 +sphinx>=1.1.2,!=1.2.0,<1.3 +sphinxcontrib-pecanwsme>=0.8 +testrepository>=0.0.18 +testtools>=0.9.34