Merge "Updated from global requirements"

This commit is contained in:
Jenkins 2016-05-18 00:24:13 +00:00 committed by Gerrit Code Review
commit 4235456eea
2 changed files with 11 additions and 7 deletions

View File

@ -12,6 +12,8 @@
# implied. # implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# 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 # In python < 2.7.4, a lazy loading of package `pbr` will break

View File

@ -1,12 +1,14 @@
# 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
# process, which may cause wedges in the gate later.
# of appearance. # of appearance.
hacking<0.11,>=0.10.0 hacking<0.11,>=0.10.0
flake8-docstrings==0.2.1.post1 flake8-docstrings==0.2.1.post1 # MIT
coverage>=3.6 coverage>=3.6 # Apache-2.0
fixtures>=1.3.1 fixtures<2.0,>=1.3.1 # Apache-2.0/BSD
sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD
testrepository>=0.0.18 testrepository>=0.0.18 # Apache-2.0/BSD
testresources>=0.2.4 testresources>=0.2.4 # Apache-2.0/BSD
testtools>=1.4.0 testtools>=1.4.0 # MIT