doc: Make python bindings doc build

Babeltrace 1 Python bindings (the babeltrace package) were removed in
commit

    1c81bd8895c0 ("Remove babeltrace 1 Python bindings and tests")

However, the Python doc still references it.  It tries to import it to
get the version, and therefore fails to build.  Update it to import the
bt2 package instead.

Change-Id: I656a89ad83069f6794abf4c775a14fb9be2ecba0
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1124
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>

diff --git a/doc/bindings/python/Makefile.am b/doc/bindings/python/Makefile.am
index 6737c79e4cd25773a7533ff08522138d6b21ba02..e12ed58917fe1ba0b17ddde9d3fd1a6b1c602ad1 100644 (file)
--- a/doc/bindings/python/Makefile.am
+++ b/doc/bindings/python/Makefile.am
@@ -9,9 +9,8 @@ EXTRA_DIST = $(srcdir)/source $(srcdir)/sphinx-build.py
 
 all-local: $(SPHINX_HTML_TARGET) $(SPHINX_DIRHTML_TARGET)
 
-PYTHON_BABELTRACE_BUILD_LIB_DIR = $(abs_top_builddir)/bindings/python/babeltrace/build/build_lib
 PYTHON_BT2_BUILD_LIB_DIR = $(abs_top_builddir)/bindings/python/bt2/build/build_lib
-PP = $(PYTHON_BABELTRACE_BUILD_LIB_DIR):$(PYTHON_BT2_BUILD_LIB_DIR)
+PP = $(PYTHON_BT2_BUILD_LIB_DIR)
 LLP = $(abs_top_builddir)/lib/.libs
 LOCAL_SPHINXBUILD = PYTHONPATH="$(PP)" LD_LIBRARY_PATH="$(LLP)" $(PYTHON) $(srcdir)/sphinx-build.py
 SPHINX_SRC = $(wildcard $(SPHINX_SOURCE_DIR)/*.rst)

diff --git a/doc/bindings/python/source/conf.py b/doc/bindings/python/source/conf.py
index 9e52c56937990185d7aca2b93eb0682c86e53b34..e39de7c66dcbc0ea6de9e4a10dda74d2af70ebfb 100644 (file)
--- a/doc/bindings/python/source/conf.py
+++ b/doc/bindings/python/source/conf.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-import babeltrace
+import bt2
 import os
 
 
@@ -15,8 +15,8 @@ source_suffix = '.rst'
 source_encoding = 'utf-8-sig'
 master_doc = 'index'
 project = 'Babeltrace legacy Python bindings'
-copyright = '2017, EfficiOS Inc.'
-version = babeltrace.__version__
+copyright = '2019, EfficiOS Inc.'
+version = bt2.__version__
 release = version
 language = None
 today = ''