summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2017-10-01 15:17:46 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2017-10-01 15:18:08 +0000
commite3aceb08ac82e4cf7968fbdcf47a3b28611a7277 (patch)
treec90f0667b2c65baf7a2a3fc6e1381113c397155d
parentReleasing progress-linux version 1.0.1-1~dschinn1. (diff)
downloadsphinxcontrib-websupport-e3aceb08ac82e4cf7968fbdcf47a3b28611a7277.zip
sphinxcontrib-websupport-e3aceb08ac82e4cf7968fbdcf47a3b28611a7277.tar.xz
Merging debian version 1.0.1-2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog10
-rw-r--r--debian/control10
-rw-r--r--debian/gbp.conf2
-rw-r--r--debian/patches/series2
-rw-r--r--debian/patches/sphinx16_translator_class.diff34
-rw-r--r--debian/patches/tests_fix_import.diff23
6 files changed, 76 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index 4654f35..8a4a95f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+sphinxcontrib-websupport (1.0.1-2) unstable; urgency=medium
+
+ * Add two patches to fix compatibility with Sphinx 1.6 (closes: #877158):
+ - tests_fix_import.diff: Import local sqlalchemystorage in tests.
+ - sphinx16_translator_class.diff: Use new API to set translator class.
+ * Bump Sphinx dependency to 1.6, to be able to use the new API.
+ * Bump Standards-Version to 4.1.1, no changes needed.
+
+ -- Dmitry Shachnev <mitya57@debian.org> Fri, 29 Sep 2017 22:53:04 +0300
+
sphinxcontrib-websupport (1.0.1-1~dschinn1) dschinn-backports; urgency=medium
* Initial upload to dschinn-backports.
diff --git a/debian/control b/debian/control
index a4eda2e..546825d 100644
--- a/debian/control
+++ b/debian/control
@@ -13,20 +13,20 @@ Build-Depends: debhelper (>= 10),
python-all,
python-pytest <!nocheck>,
python-setuptools,
- python-sphinx <!nocheck>,
+ python-sphinx (>= 1.6) <!nocheck>,
python-sqlalchemy <!nocheck>,
python-whoosh <!nocheck>,
python-xapian <!nocheck>,
python3-all,
python3-pytest <!nocheck>,
python3-setuptools,
- python3-sphinx <!nocheck>,
+ python3-sphinx (>= 1.6) <!nocheck>,
python3-sqlalchemy <!nocheck>,
python3-whoosh <!nocheck>,
python3-xapian <!nocheck>
X-Python-Version: >= 2.7
X-Python3-Version: >= 3.4
-Standards-Version: 4.0.0
+Standards-Version: 4.1.1
Vcs-Browser: https://sources.progress-linux.org/distributions/dschinn-backports/packages/sphinxcontrib-websupport
Vcs-Git: https://sources.progress-linux.org/distributions/dschinn-backports/packages/sphinxcontrib-websupport
XSBC-Original-Vcs-Browser: https://anonscm.debian.org/git/python-modules/packages/sphinxcontrib-websupport.git
@@ -34,7 +34,7 @@ XSBC-Original-Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/sp
Package: python-sphinxcontrib.websupport
Architecture: all
-Depends: python-sphinx, ${misc:Depends}, ${python:Depends}
+Depends: python-sphinx (>= 1.6), ${misc:Depends}, ${python:Depends}
Recommends: python-sqlalchemy, python-whoosh, python-xapian
Description: API to integrate Sphinx documentation into Web applications (Python 2)
This module provides a means for integrating documentation built with Sphinx
@@ -45,7 +45,7 @@ Description: API to integrate Sphinx documentation into Web applications (Python
Package: python3-sphinxcontrib.websupport
Architecture: all
-Depends: python3-sphinx, ${misc:Depends}, ${python3:Depends}
+Depends: python3-sphinx (>= 1.6), ${misc:Depends}, ${python3:Depends}
Recommends: python3-sqlalchemy, python3-whoosh, python3-xapian
Description: API to integrate Sphinx documentation into Web applications (Python 3)
This module provides a means for integrating documentation built with Sphinx
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..3879982
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,2 @@
+[DEFAULT]
+debian-branch=debian/master
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..c796121
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+tests_fix_import.diff
+sphinx16_translator_class.diff
diff --git a/debian/patches/sphinx16_translator_class.diff b/debian/patches/sphinx16_translator_class.diff
new file mode 100644
index 0000000..27e118c
--- /dev/null
+++ b/debian/patches/sphinx16_translator_class.diff
@@ -0,0 +1,34 @@
+From: Dmitry Shachnev <mitya57@debian.org>
+Date: Fri, 29 Sep 2017 17:30:54 +0300
+Subject: Replace init_translator_class method with default_translator_class
+ attribute
+
+To fix compatibility with Sphinx 1.6, see sphinx-doc/sphinx@78ea36a787a762bb.
+---
+ sphinxcontrib/websupport/builder.py | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/sphinxcontrib/websupport/builder.py b/sphinxcontrib/websupport/builder.py
+index d38626e..da12961 100644
+--- a/sphinxcontrib/websupport/builder.py
++++ b/sphinxcontrib/websupport/builder.py
+@@ -34,6 +34,7 @@ class WebSupportBuilder(PickleHTMLBuilder):
+ name = 'websupport'
+ versioning_method = 'commentable'
+ versioning_compare = True # for commentable node's uuid stability.
++ default_translator_class = WebSupportTranslator
+
+ def init(self):
+ # type: () -> None
+@@ -54,11 +55,6 @@ class WebSupportBuilder(PickleHTMLBuilder):
+ self.search = search
+ self.storage = storage
+
+- def init_translator_class(self):
+- # type: () -> None
+- if self.translator_class is None:
+- self.translator_class = WebSupportTranslator
+-
+ def prepare_writing(self, docnames):
+ # type: (Iterable[unicode]) -> None
+ PickleHTMLBuilder.prepare_writing(self, docnames)
diff --git a/debian/patches/tests_fix_import.diff b/debian/patches/tests_fix_import.diff
new file mode 100644
index 0000000..7d8d7bf
--- /dev/null
+++ b/debian/patches/tests_fix_import.diff
@@ -0,0 +1,23 @@
+From: Dmitry Shachnev <mitya57@debian.org>
+Date: Fri, 29 Sep 2017 17:28:14 +0300
+Subject: tests: Import Session, Comment and CommentVote from local module
+
+The sphinx.websupport.storage.sqlalchemystorage wrapper module only
+provides SQLAlchemyStorage, but not these names.
+---
+ tests/test_websupport.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/test_websupport.py b/tests/test_websupport.py
+index 91f67bf..c7e357c 100644
+--- a/tests/test_websupport.py
++++ b/tests/test_websupport.py
+@@ -15,7 +15,7 @@ from sphinx.websupport.errors import DocumentNotFoundError, \
+ from sphinx.websupport.storage import StorageBackend
+ from sphinx.websupport.storage.differ import CombinedHtmlDiff
+ try:
+- from sphinx.websupport.storage.sqlalchemystorage import Session, \
++ from sphinxcontrib.websupport.storage.sqlalchemystorage import Session, \
+ Comment, CommentVote
+ from sphinx.websupport.storage.sqlalchemy_db import Node
+ sqlalchemy_missing = False