Update requirements for Sphinx 1.5

Update requirements to current global-requirements including Sphinx 1.5.
Add pbr as requirement.
Use update-requirements from requirements repo to sync content.

Migrate pbr's obsolete warnerrors to Sphinx' warning-is-error.
Fix any sphinx problems.

Change-Id: Id7d5783c5d5c1077d03ddcb18d813699561579e3
This commit is contained in:
Andreas Jaeger 2017-03-02 19:05:46 +01:00
parent 26d8591e5f
commit 62e8202e61
6 changed files with 36 additions and 20 deletions

View File

@ -1,3 +1,10 @@
oslosphinx
sphinx>=1.1.2,<1.2
# 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.
pbr>=2.0.0 # Apache-2.0
oslosphinx>=4.7.0 # Apache-2.0
sphinx>=1.5.1 # BSD
yasfb>=0.5.1

View File

@ -15,9 +15,7 @@ classifier =
source-dir = doc/source
build-dir = doc/build
all_files = 1
[pbr]
warnerrors = True
warning-is-error = 1
[upload_sphinx]
upload-dir = doc/build/html

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.
#
# 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
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(
setup_requires=['pbr'],
setup_requires=['pbr>=1.8'],
pbr=True)

View File

@ -118,18 +118,19 @@ Testing
We need to update review-dev.o.o with Gerrit 2.13 and test the
following integrations:
- data migration
- gerrit replication
- gerrit javascript (toggle-ci & test results)
- jeepyb integration
- zuul integration
- storyboard integration (its-storyboard plugin)
- launchpad integration
- gerrty
- rollback
- javamelody plugin
- gerrit hooks
- git-review
- data migration
- gerrit replication
- gerrit javascript (toggle-ci & test results)
- jeepyb integration
- zuul integration
- storyboard integration (its-storyboard plugin)
- launchpad integration
- gerrty
- rollback
- javamelody plugin
- gerrit hooks
- git-review
Dependencies

View File

@ -56,7 +56,7 @@ out of the application classes and put it in the node definition. Example:
sysadmins => hiera('sysadmins', 'default'),
}
class {'openstack_project::review':
... other params ..
# ... other params ..
}
}

View File

@ -0,0 +1,3 @@
# 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.