Manual sync with global-requirements

Change-Id: I83bb05325bfc5b85d8c38d5936db37bbc62ad9d3
This commit is contained in:
Tony Breeds 2016-12-22 11:33:29 +11:00 committed by Hiroaki Kobayashi
parent ffc660fead
commit 6b2774ad2d
3 changed files with 14 additions and 14 deletions

View File

@ -1,4 +1,5 @@
# The order of packages is significant, because pip processes them in the order # 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 # 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.
kombu>=3.0.25,<4.0.0 # BSD kombu<4.0.0,>=3.0.25 # BSD

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");
@ -26,5 +25,5 @@ except ImportError:
pass pass
setuptools.setup( setuptools.setup(
setup_requires=['pbr'], setup_requires=['pbr>=1.8'],
pbr=True) pbr=True)

View File

@ -2,19 +2,19 @@
# 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.8.0,<0.9 hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
nose nose # LGPL
mock>=1.0 mock>=2.0 # BSD
mox>=0.5.3 mox>=0.5.3 # Apache-2.0
sphinx>=1.1.2,!=1.2.0,<1.3 sphinx!=1.3b1,<1.4,>=1.2.1 # BSD
sphinxcontrib-httpdomain sphinxcontrib-httpdomain # BSD
discover discover # BSD
fixtures>=0.3.14 fixtures>=3.0.0 # Apache-2.0/BSD
testrepository>=0.0.18 testrepository>=0.0.18 # Apache-2.0/BSD
testtools>=0.9.34 testtools>=1.4.0 # MIT
coverage>=3.6 coverage>=4.0 # Apache-2.0
http://tarballs.openstack.org/nova/nova-master.tar.gz#egg=nova http://tarballs.openstack.org/nova/nova-master.tar.gz#egg=nova
oslotest>=1.10.0 # Apache-2.0 oslotest>=1.10.0 # Apache-2.0