summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Finucane <sfinucan@redhat.com>2017-04-12 11:31:41 +0100
committerStephen Finucane <sfinucan@redhat.com>2017-04-14 18:05:42 +0000
commit1ed853109574e4ae6f8dae932f292b751749f747 (patch)
tree2b669fdf30f1de5a27f98894eab34b3bc0f41993
parent54fb6e71b71b8467352edd745399940444aac435 (diff)
Remove 'build_sphinx_latex'
codesearch.o.o shows a single, long-dead project using this [1]. Let's just remove it and push people to set 'builders' instead in they really want LaTeX. [1] http://codesearch.openstack.org/?q=build_sphinx_latex Change-Id: I820d9c540ae81717d7b33bbb4d2a4031b529b52c
Notes
Notes (review): Code-Review+2: Monty Taylor <mordred@inaugust.com> Code-Review+2: Julien Danjou <julien@danjou.info> Workflow+1: ChangBo Guo(gcb) <glongwave@gmail.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Sat, 15 Apr 2017 14:43:34 +0000 Reviewed-on: https://review.openstack.org/456157 Project: openstack-dev/pbr Branch: refs/heads/master
-rw-r--r--pbr/builddoc.py5
-rw-r--r--pbr/hooks/commands.py1
-rw-r--r--pbr/packaging.py2
3 files changed, 0 insertions, 8 deletions
diff --git a/pbr/builddoc.py b/pbr/builddoc.py
index eedbd16..1359624 100644
--- a/pbr/builddoc.py
+++ b/pbr/builddoc.py
@@ -227,8 +227,3 @@ class LocalBuildDoc(setup_command.BuildDoc):
227 # handle Sphinx < 1.5.0 227 # handle Sphinx < 1.5.0
228 if not hasattr(self, 'warning_is_error'): 228 if not hasattr(self, 'warning_is_error'):
229 self.warning_is_error = False 229 self.warning_is_error = False
230
231
232class LocalBuildLatex(LocalBuildDoc):
233 builders = ['latex']
234 command_name = 'build_sphinx_latex'
diff --git a/pbr/hooks/commands.py b/pbr/hooks/commands.py
index d9b56b5..aa4db70 100644
--- a/pbr/hooks/commands.py
+++ b/pbr/hooks/commands.py
@@ -49,7 +49,6 @@ class CommandsConfig(base.BaseConfig):
49 49
50 if packaging.have_sphinx(): 50 if packaging.have_sphinx():
51 self.add_command('pbr.builddoc.LocalBuildDoc') 51 self.add_command('pbr.builddoc.LocalBuildDoc')
52 self.add_command('pbr.builddoc.LocalBuildLatex')
53 52
54 if os.path.exists('.testr.conf') and packaging.have_testr(): 53 if os.path.exists('.testr.conf') and packaging.have_testr():
55 # There is a .testr.conf file. We want to use it. 54 # There is a .testr.conf file. We want to use it.
diff --git a/pbr/packaging.py b/pbr/packaging.py
index 484cd24..a3527c9 100644
--- a/pbr/packaging.py
+++ b/pbr/packaging.py
@@ -536,11 +536,9 @@ try:
536 # Import the symbols from their new home so the package API stays 536 # Import the symbols from their new home so the package API stays
537 # compatible. 537 # compatible.
538 LocalBuildDoc = builddoc.LocalBuildDoc 538 LocalBuildDoc = builddoc.LocalBuildDoc
539 LocalBuildLatex = builddoc.LocalBuildLatex
540except ImportError: 539except ImportError:
541 _have_sphinx = False 540 _have_sphinx = False
542 LocalBuildDoc = None 541 LocalBuildDoc = None
543 LocalBuildLatex = None
544 542
545 543
546def have_sphinx(): 544def have_sphinx():