Update requirements

Update requirements with global requirements so that this is compatible
with other development tools. Right now the requirement on pbr forces
a downgrade of pbr - see
http://lists.openstack.org/pipermail/openstack-dev/2016-January/083297.html

Change-Id: Ica86a4fd23e47b901537af02807bbb104c4ed578
This commit is contained in:
Andreas Jaeger 2016-01-05 08:38:31 +01:00
parent 281bba3ebd
commit eefd65fd29
3 changed files with 20 additions and 13 deletions

View File

@ -2,6 +2,6 @@
# of appearance. Changing the order has an impact on the overall integration # of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later. # process, which may cause wedges in the gate later.
pbr>=0.6,!=0.7,<1.0 pbr>=1.6
argparse argparse
Babel>=0.9.6 Babel>=1.3

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. # Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # 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 # THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
import setuptools 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( setuptools.setup(
setup_requires=['pbr'], setup_requires=['pbr>=1.8'],
pbr=True) pbr=True)

View File

@ -2,15 +2,15 @@
# of appearance. Changing the order has an impact on the overall integration # of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later. # process, which may cause wedges in the gate later.
hacking>=0.10.0,<0.11 hacking<0.11,>=0.10.0
mock>=1.0 mock>=1.2
coverage>=3.6 coverage>=3.6
discover discover
fixtures>=0.3.14 fixtures>=1.3.1
python-subunit python-subunit>=0.0.18
sphinx>=1.1.2 sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
oslosphinx oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
testrepository>=0.0.17 testrepository>=0.0.18
testscenarios>=0.4,<0.5 testscenarios>=0.4
testtools>=0.9.32 testtools>=1.4.0