diff -Nru sphinxcontrib-websupport-1.1.0/debian/changelog sphinxcontrib-websupport-1.1.0/debian/changelog --- sphinxcontrib-websupport-1.1.0/debian/changelog 2018-06-15 15:28:03.000000000 +0000 +++ sphinxcontrib-websupport-1.1.0/debian/changelog 2019-01-09 21:02:42.000000000 +0000 @@ -1,3 +1,14 @@ +sphinxcontrib-websupport (1.1.0-2) unstable; urgency=medium + + * Add a patch to fix failing tests with Sphinx 1.8 by using the same DB + session for has_node() as for add_node() (sphinx1.8_db_session.diff). + * Bump Standards-Version to 4.3.0, no changes needed. + * Do not install sphinxcontrib_websupport-*-nspkg.pth files: + - On Python 3, rely on PEP 420 implicit namespaces. + - On Python 2, rely on namespace feature of dh_python2. + + -- Dmitry Shachnev Thu, 10 Jan 2019 00:02:42 +0300 + sphinxcontrib-websupport (1.1.0-1) unstable; urgency=medium [ Ondřej Nový ] diff -Nru sphinxcontrib-websupport-1.1.0/debian/control sphinxcontrib-websupport-1.1.0/debian/control --- sphinxcontrib-websupport-1.1.0/debian/control 2018-06-15 15:28:03.000000000 +0000 +++ sphinxcontrib-websupport-1.1.0/debian/control 2019-01-09 21:02:42.000000000 +0000 @@ -21,7 +21,7 @@ python3-sqlalchemy , python3-whoosh , python3-xapian -Standards-Version: 4.1.4 +Standards-Version: 4.3.0 Vcs-Git: https://salsa.debian.org/python-team/modules/sphinxcontrib-websupport.git Vcs-Browser: https://salsa.debian.org/python-team/modules/sphinxcontrib-websupport diff -Nru sphinxcontrib-websupport-1.1.0/debian/patches/series sphinxcontrib-websupport-1.1.0/debian/patches/series --- sphinxcontrib-websupport-1.1.0/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ sphinxcontrib-websupport-1.1.0/debian/patches/series 2019-01-09 21:02:42.000000000 +0000 @@ -0,0 +1 @@ +sphinx1.8_db_session.diff diff -Nru sphinxcontrib-websupport-1.1.0/debian/patches/sphinx1.8_db_session.diff sphinxcontrib-websupport-1.1.0/debian/patches/sphinx1.8_db_session.diff --- sphinxcontrib-websupport-1.1.0/debian/patches/sphinx1.8_db_session.diff 1970-01-01 00:00:00.000000000 +0000 +++ sphinxcontrib-websupport-1.1.0/debian/patches/sphinx1.8_db_session.diff 2019-01-09 21:02:42.000000000 +0000 @@ -0,0 +1,23 @@ +From: Dmitry Shachnev +Date: Tue, 1 Jan 2019 19:29:46 +0300 +Subject: Use the same DB session for has_node() as for add_node() + +--- + sphinxcontrib/websupport/storage/sqlalchemystorage.py | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/sphinxcontrib/websupport/storage/sqlalchemystorage.py b/sphinxcontrib/websupport/storage/sqlalchemystorage.py +index 6b65c57..5a32539 100755 +--- a/sphinxcontrib/websupport/storage/sqlalchemystorage.py ++++ b/sphinxcontrib/websupport/storage/sqlalchemystorage.py +@@ -42,9 +42,7 @@ class SQLAlchemyStorage(StorageBackend): + self.build_session = Session() + + def has_node(self, id): +- session = Session() +- node = session.query(Node).filter(Node.id == id).first() +- session.close() ++ node = self.build_session.query(Node).filter(Node.id == id).first() + return bool(node) + + def add_node(self, id, document, source): diff -Nru sphinxcontrib-websupport-1.1.0/debian/python3-sphinxcontrib.websupport.pyremove sphinxcontrib-websupport-1.1.0/debian/python3-sphinxcontrib.websupport.pyremove --- sphinxcontrib-websupport-1.1.0/debian/python3-sphinxcontrib.websupport.pyremove 1970-01-01 00:00:00.000000000 +0000 +++ sphinxcontrib-websupport-1.1.0/debian/python3-sphinxcontrib.websupport.pyremove 2019-01-09 21:02:42.000000000 +0000 @@ -0,0 +1 @@ +sphinxcontrib_websupport-*-nspkg.pth diff -Nru sphinxcontrib-websupport-1.1.0/debian/python-sphinxcontrib.websupport.pyremove sphinxcontrib-websupport-1.1.0/debian/python-sphinxcontrib.websupport.pyremove --- sphinxcontrib-websupport-1.1.0/debian/python-sphinxcontrib.websupport.pyremove 1970-01-01 00:00:00.000000000 +0000 +++ sphinxcontrib-websupport-1.1.0/debian/python-sphinxcontrib.websupport.pyremove 2019-01-09 21:02:42.000000000 +0000 @@ -0,0 +1 @@ +sphinxcontrib_websupport-*-nspkg.pth