openstack/openstack-ansible-os_magnum
Code Issues Proposed changes

Merge "Updated from global requirements"

Browse Source
This commit is contained in:
Jenkins 2016-07-15 09:45:23 +00:00 committed by Gerrit Code Review
commit 8fccd3e2c9
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
setup.py
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)

11
test-requirements.txt
View File

@ -1,8 +1,11 @@
# 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.
bashate>=0.2 # Apache-2.0 bashate>=0.2 # Apache-2.0
flake8>=2.5.4,<2.6.0 # MIT flake8<2.6.0,>=2.5.4 # MIT
# this is required for the docs build jobs # this is required for the docs build jobs
sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 # BSD sphinx!=1.3b1,<1.3,>=1.2.1 # BSD
oslosphinx>=2.5.0,!=3.4.0 # Apache-2.0 oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
doc8 # Apache-2.0 doc8 # Apache-2.0
reno>=1.6.2 # Apache-2.0 reno>=1.8.0 # Apache2