diff options
| -rw-r--r-- | pbr/builddoc.py | 9 | ||||
| -rw-r--r-- | test-requirements.txt | 7 |
2 files changed, 9 insertions, 7 deletions
diff --git a/pbr/builddoc.py b/pbr/builddoc.py index 7c9916b..60f2afd 100644 --- a/pbr/builddoc.py +++ b/pbr/builddoc.py @@ -26,7 +26,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 @@ -126,16 +125,16 @@ 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_config.init_values() - if self.builder == 'man' and len(sphinx_config.man_pages) == 0: - return + app = application.Sphinx( self.source_dir, self.config_dir, self.builder_target_dir, self.doctree_dir, self.builder, confoverrides, status_stream, freshenv=self.fresh_env, warningiserror=True) + if self.builder == 'man' and len(app.config.man_pages) == 0: + return + try: app.build(force_all=self.all_files) except Exception as err: diff --git a/test-requirements.txt b/test-requirements.txt index 6e4521c..97f3a79 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,13 +1,16 @@ +# 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. coverage>=3.6 discover fixtures>=0.3.14 hacking>=0.10.0,<0.11 mock>=1.0 python-subunit>=0.0.18 -sphinx>=1.1.2,<1.2 +sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 six>=1.9.0 testrepository>=0.0.18 testresources>=0.2.4 testscenarios>=0.4 -testtools>=0.9.34 +testtools>=0.9.36,!=1.2.0 virtualenv |