Sync with global requirements

Manually sync with global requirements to get newer pbr in.

Changes are:
    pbr>=0.6,!=0.7,<1.0            ->   pbr>=1.3,<2.0
    testtools>=0.9.36,!=1.2.0      ->   testtools>=1.4.0

Change-Id: Idf4d84db82e2369c7fce3597bc31895293f475cf
This commit is contained in:
Andreas Jaeger 2015-07-17 09:11:07 +02:00
parent f089f5f3ff
commit 64d6152bcd
2 changed files with 17 additions and 7 deletions

View File

@ -1,7 +1,10 @@
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
# 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<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

11
setup.py Executable file → Normal file
View File

@ -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");
@ -17,6 +16,14 @@
# 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'],
setup_requires=['pbr>=1.3'],
pbr=True)