diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-03-30 18:19:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-03-30 18:19:42 +0000 |
| commit | 5a21031398e426c20562417081eaabf2b535aca2 (patch) | |
| tree | ddd54d690a0ca7ae6e4e4576b4af4d4136888792 | |
| parent | 02228ceb2110a1bc2c484ff1a715dd664740efe2 (diff) | |
| parent | 2d7c0045f402b31d6223437ba25423eeb32278e1 (diff) | |
| download | pbr-2.1.0.tar.gz | |
Merge "Initialize sphinx config using application instead of config"2.1.0
| -rw-r--r-- | pbr/builddoc.py | 17 | ||||
| -rw-r--r-- | pbr/tests/test_setup.py | 6 |
2 files changed, 9 insertions, 14 deletions
diff --git a/pbr/builddoc.py b/pbr/builddoc.py index f51b283..4f05673 100644 --- a/pbr/builddoc.py +++ b/pbr/builddoc.py @@ -17,9 +17,7 @@ from distutils import log import fnmatch import os -import pkg_resources import sys -import warnings try: import cStringIO @@ -29,7 +27,6 @@ except ImportError: try: from sphinx import apidoc from sphinx import application - from sphinx import config from sphinx import setup_command except Exception as e: # NOTE(dhellmann): During the installation of docutils, setuptools @@ -134,16 +131,6 @@ class LocalBuildDoc(setup_command.BuildDoc): confoverrides['release'] = self.release if self.today: confoverrides['today'] = self.today - sphinx_config = config.Config(self.config_dir, 'conf.py', {}, []) - sphinx_ver = pkg_resources.parse_version( - pkg_resources.get_distribution("sphinx").version) - if sphinx_ver > pkg_resources.parse_version('1.2.3'): - sphinx_config.init_values(warnings.warn) - else: - sphinx_config.init_values() - if self.builder == 'man' and len( - getattr(sphinx_config, 'man_pages', '')) == 0: - return if self.sphinx_initialized: confoverrides['suppress_warnings'] = [ 'app.add_directive', 'app.add_role', @@ -153,6 +140,10 @@ class LocalBuildDoc(setup_command.BuildDoc): self.builder_target_dir, self.doctree_dir, self.builder, confoverrides, status_stream, freshenv=self.fresh_env, warningiserror=self.warning_is_error) + sphinx_config = app.config + if self.builder == 'man' and len( + getattr(sphinx_config, 'man_pages', '')) == 0: + return self.sphinx_initialized = True try: diff --git a/pbr/tests/test_setup.py b/pbr/tests/test_setup.py index 0754a8d..0930e35 100644 --- a/pbr/tests/test_setup.py +++ b/pbr/tests/test_setup.py @@ -224,6 +224,10 @@ class GitLogsTest(base.BaseTestCase): self.assertTrue(co_author in authors) +class _SphinxConfig(object): + man_pages = ['foo'] + + class BaseSphinxTest(base.BaseTestCase): def setUp(self): @@ -234,7 +238,7 @@ class BaseSphinxTest(base.BaseTestCase): self.useFixture(fixtures.MonkeyPatch( "sphinx.application.Sphinx.build", lambda *a, **kw: None)) self.useFixture(fixtures.MonkeyPatch( - "sphinx.config.Config.man_pages", ['foo'])) + "sphinx.application.Sphinx.config", _SphinxConfig)) self.useFixture(fixtures.MonkeyPatch( "sphinx.config.Config.init_values", lambda *a: None)) self.useFixture(fixtures.MonkeyPatch( |