opendev/system-config
Code Issues Proposed changes

Merge "Update to sphinx 1.5"

Browse Source
This commit is contained in:
Jenkins 2017-03-22 19:25:14 +00:00 committed by Gerrit Code Review
commit f4032071e4
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
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");
@ -14,8 +13,17 @@
# 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
# 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)

13
test-requirements.txt
View File

@ -1,6 +1,9 @@
hacking>=0.5.6,<0.8 # The order of packages is significant, because pip processes them in the order
Sphinx>=1.1.2,<1.2 # of appearance. Changing the order has an impact on the overall integration
oslosphinx # process, which may cause wedges in the gate later.
bashate>=0.2 hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
PyYAML sphinx>=1.5.1 # BSD
oslosphinx>=4.7.0 # Apache-2.0
bashate>=0.2 # Apache-2.0
PyYAML>=3.10.0 # MIT
ansible-lint ansible-lint