summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2018-09-14 09:36:30 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2018-09-14 09:36:30 +0000
commita7186e41751a6539405e29bbf96df7845d74b2af (patch)
treec01bb6e501d250225f961ad1b3b7fb31089df786
parentMerging upstream version 1.1.0. (diff)
downloadsphinxcontrib-websupport-a7186e41751a6539405e29bbf96df7845d74b2af.zip
sphinxcontrib-websupport-a7186e41751a6539405e29bbf96df7845d74b2af.tar.xz
Merging debian version 1.1.0-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog14
-rw-r--r--debian/clean2
-rw-r--r--debian/compat2
-rw-r--r--debian/control4
-rw-r--r--debian/patches/series3
-rw-r--r--debian/patches/sphinx16_translator_class.diff34
-rw-r--r--debian/patches/sphinx17_tests.diff405
-rw-r--r--debian/patches/tests_fix_import.diff23
8 files changed, 18 insertions, 469 deletions
diff --git a/debian/changelog b/debian/changelog
index 9a87982..6fc2a71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+sphinxcontrib-websupport (1.1.0-1) unstable; urgency=medium
+
+ [ Ondřej Nový ]
+ * d/control: Remove ancient X-Python-Version field
+ * d/control: Remove ancient X-Python3-Version field
+
+ [ Dmitry Shachnev ]
+ * New upstream release.
+ * Drop all patches, applied upstream.
+ * Add debian/clean file listing autogenerated files.
+ * Update debhelper compat level to 11.
+
+ -- Dmitry Shachnev <mitya57@debian.org> Fri, 15 Jun 2018 18:28:03 +0300
+
sphinxcontrib-websupport (1.0.1-3~dschinn1) dschinn-backports; urgency=medium
* Uploading to dschinn-backports, remaining changes:
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..605c16c
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,2 @@
+PKG-INFO
+sphinxcontrib_websupport.egg-info/
diff --git a/debian/compat b/debian/compat
index f599e28..b4de394 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-10
+11
diff --git a/debian/control b/debian/control
index ca59cb7..c6f4233 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ XSBC-Original-Maintainer: Debian Python Modules Team <python-modules-team@lists.
XSBC-Original-Uploaders: Dmitry Shachnev <mitya57@debian.org>
Bugs: mailto:maintainers@lists.progress-linux.org
Homepage: https://github.com/sphinx-doc/sphinxcontrib-websupport
-Build-Depends: debhelper (>= 10),
+Build-Depends: debhelper (>= 11),
dh-python,
dpkg-dev (>= 1.17.14),
python-all,
@@ -24,8 +24,6 @@ Build-Depends: debhelper (>= 10),
python3-sqlalchemy <!nocheck>,
python3-whoosh <!nocheck>,
python3-xapian <!nocheck>
-X-Python-Version: >= 2.7
-X-Python3-Version: >= 3.4
Standards-Version: 4.1.4
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
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index d465cf9..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-tests_fix_import.diff
-sphinx16_translator_class.diff
-sphinx17_tests.diff
diff --git a/debian/patches/sphinx16_translator_class.diff b/debian/patches/sphinx16_translator_class.diff
deleted file mode 100644
index 27e118c..0000000
--- a/debian/patches/sphinx16_translator_class.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-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/sphinx17_tests.diff b/debian/patches/sphinx17_tests.diff
deleted file mode 100644
index 014c2d8..0000000
--- a/debian/patches/sphinx17_tests.diff
+++ /dev/null
@@ -1,405 +0,0 @@
-From: shimizukawa <shimizukawa@gmail.com>
-Date: Fri, 16 Mar 2018 11:57:01 +0900
-Subject: Support testing with Sphinx-1.7
-
----
- tests/test_searchadapters.py | 7 +-
- tests/util.py | 330 +------------------------------------------
- 2 files changed, 6 insertions(+), 331 deletions(-)
-
-diff --git a/tests/test_searchadapters.py b/tests/test_searchadapters.py
-index 79109db..a044b65 100644
---- a/tests/test_searchadapters.py
-+++ b/tests/test_searchadapters.py
-@@ -10,11 +10,12 @@
- """
-
- from six import StringIO
-+import pytest
-
- from sphinx.websupport import WebSupport
-
- from test_websupport import sqlalchemy_missing
--from util import rootdir, tempdir, skip_if, skip_unless_importable
-+from util import rootdir, tempdir, skip_unless_importable
-
-
- def teardown_module():
-@@ -58,12 +59,12 @@ def search_adapter_helper(adapter):
-
-
- @skip_unless_importable('xapian', 'needs xapian bindings installed')
--@skip_if(sqlalchemy_missing, 'needs sqlalchemy')
-+@pytest.mark.skipif(sqlalchemy_missing, reason='needs sqlalchemy')
- def test_xapian():
- search_adapter_helper('xapian')
-
-
- @skip_unless_importable('whoosh', 'needs whoosh package installed')
--@skip_if(sqlalchemy_missing, 'needs sqlalchemy')
-+@pytest.mark.skipif(sqlalchemy_missing, reason='needs sqlalchemy')
- def test_whoosh():
- search_adapter_helper('whoosh')
-diff --git a/tests/util.py b/tests/util.py
-index b463629..0cbe318 100644
---- a/tests/util.py
-+++ b/tests/util.py
-@@ -8,90 +8,26 @@
- """
-
- import os
--import re
--import sys
- import tempfile
--import warnings
--from functools import wraps
--from xml.etree import ElementTree
--
--from six import string_types
--from six import StringIO
-
- import pytest
-
--from docutils import nodes
--from docutils.parsers.rst import directives, roles
--
--from sphinx import application
--from sphinx.builders.latex import LaTeXBuilder
--from sphinx.ext.autodoc import AutoDirective
--from sphinx.pycode import ModuleAnalyzer
--from sphinx.deprecation import RemovedInSphinx17Warning
--
- from path import path
-
-
- __all__ = [
- 'rootdir', 'tempdir',
-- 'skip_unless_importable', 'Struct',
-- 'SphinxTestApp',
-- 'path',
-- 'remove_unicode_literals',
-+ 'skip_unless_importable',
- ]
-
-
--rootdir = path(os.path.dirname(__file__) or '.').abspath()
-+rootdir = path(__file__).abspath().parent
- if 'SPHINX_TEST_TEMPDIR' in os.environ:
- tempdir = path(os.environ['SPHINX_TEST_TEMPDIR']).abspath()
- else:
- tempdir = path(tempfile.mkdtemp()).abspath()
-
-
--def assert_re_search(regex, text, flags=0):
-- if not re.search(regex, text, flags):
-- assert False, '%r did not match %r' % (regex, text)
--
--
--def assert_not_re_search(regex, text, flags=0):
-- if re.search(regex, text, flags):
-- assert False, '%r did match %r' % (regex, text)
--
--
--def assert_startswith(thing, prefix):
-- if not thing.startswith(prefix):
-- assert False, '%r does not start with %r' % (thing, prefix)
--
--
--def assert_node(node, cls=None, xpath="", **kwargs):
-- if cls:
-- if isinstance(cls, list):
-- assert_node(node, cls[0], xpath=xpath, **kwargs)
-- if cls[1:]:
-- if isinstance(cls[1], tuple):
-- assert_node(node, cls[1], xpath=xpath, **kwargs)
-- else:
-- assert len(node) == 1, \
-- 'The node%s has %d child nodes, not one' % (xpath, len(node))
-- assert_node(node[0], cls[1:], xpath=xpath + "[0]", **kwargs)
-- elif isinstance(cls, tuple):
-- assert len(node) == len(cls), \
-- 'The node%s has %d child nodes, not %r' % (xpath, len(node), len(cls))
-- for i, nodecls in enumerate(cls):
-- path = xpath + "[%d]" % i
-- assert_node(node[i], nodecls, xpath=path, **kwargs)
-- elif isinstance(cls, string_types):
-- assert node == cls, 'The node %r is not %r: %r' % (xpath, cls, node)
-- else:
-- assert isinstance(node, cls), \
-- 'The node%s is not subclass of %r: %r' % (xpath, cls, node)
--
-- for key, value in kwargs.items():
-- assert key in node, 'The node%s does not have %r attribute: %r' % (xpath, key, node)
-- assert node[key] == value, \
-- 'The node%s[%s] is not %r: %r' % (xpath, key, value, node[key])
--
--
- def skip_unless_importable(module, msg=None):
- """Decorator to skip test if module is not importable."""
- try:
-@@ -100,265 +36,3 @@ def skip_unless_importable(module, msg=None):
- return pytest.mark.skipif(True, reason=(msg or 'conditional skip'))
- else:
- return pytest.mark.skipif(False, reason=(msg or 'conditional skip'))
--
--
--def etree_parse(path):
-- with warnings.catch_warnings(record=False):
-- warnings.filterwarnings("ignore", category=DeprecationWarning)
-- return ElementTree.parse(path)
--
--
--class Struct(object):
-- def __init__(self, **kwds):
-- self.__dict__.update(kwds)
--
--
--class SphinxTestApp(application.Sphinx):
-- """
-- A subclass of :class:`Sphinx` that runs on the test root, with some
-- better default values for the initialization parameters.
-- """
--
-- def __init__(self, buildername='html', testroot=None, srcdir=None,
-- freshenv=False, confoverrides=None, status=None, warning=None,
-- tags=None, docutilsconf=None):
-- if testroot is None:
-- defaultsrcdir = 'root'
-- testroot = rootdir / 'root'
-- else:
-- defaultsrcdir = 'test-' + testroot
-- testroot = rootdir / 'roots' / ('test-' + testroot)
-- if srcdir is None:
-- srcdir = tempdir / defaultsrcdir
-- else:
-- srcdir = tempdir / srcdir
--
-- if not srcdir.exists():
-- testroot.copytree(srcdir)
--
-- if docutilsconf is not None:
-- (srcdir / 'docutils.conf').write_text(docutilsconf)
--
-- builddir = srcdir / '_build'
--# if confdir is None:
-- confdir = srcdir
--# if outdir is None:
-- outdir = builddir.joinpath(buildername)
-- if not outdir.isdir():
-- outdir.makedirs()
--# if doctreedir is None:
-- doctreedir = builddir.joinpath('doctrees')
-- if not doctreedir.isdir():
-- doctreedir.makedirs()
-- if confoverrides is None:
-- confoverrides = {}
--# if warningiserror is None:
-- warningiserror = False
--
-- self._saved_path = sys.path[:]
-- self._saved_directives = directives._directives.copy()
-- self._saved_roles = roles._roles.copy()
--
-- self._saved_nodeclasses = set(v for v in dir(nodes.GenericNodeVisitor)
-- if v.startswith('visit_'))
--
-- try:
-- application.Sphinx.__init__(self, srcdir, confdir, outdir, doctreedir,
-- buildername, confoverrides, status, warning,
-- freshenv, warningiserror, tags)
-- except:
-- self.cleanup()
-- raise
--
-- def cleanup(self, doctrees=False):
-- AutoDirective._registry.clear()
-- ModuleAnalyzer.cache.clear()
-- LaTeXBuilder.usepackages = []
-- sys.path[:] = self._saved_path
-- sys.modules.pop('autodoc_fodder', None)
-- directives._directives = self._saved_directives
-- roles._roles = self._saved_roles
-- for method in dir(nodes.GenericNodeVisitor):
-- if method.startswith('visit_') and \
-- method not in self._saved_nodeclasses:
-- delattr(nodes.GenericNodeVisitor, 'visit_' + method[6:])
-- delattr(nodes.GenericNodeVisitor, 'depart_' + method[6:])
--
-- def __repr__(self):
-- return '<%s buildername=%r>' % (self.__class__.__name__, self.builder.name)
--
--
--_unicode_literals_re = re.compile(r'u(".*?")|u(\'.*?\')')
--
--
--def remove_unicode_literals(s):
-- return _unicode_literals_re.sub(lambda x: x.group(1) or x.group(2), s)
--
--
--def find_files(root, suffix=None):
-- for dirpath, dirs, files in os.walk(root, followlinks=True):
-- dirpath = path(dirpath)
-- for f in [f for f in files if not suffix or f.endswith(suffix)]:
-- fpath = dirpath / f
-- yield os.path.relpath(fpath, root)
--
--
--def strip_escseq(text):
-- return re.sub('\x1b.*?m', '', text)
--
--
--# #############################################
--# DEPRECATED implementations
--
--
--def gen_with_app(*args, **kwargs):
-- """
-- **DEPRECATED**: use pytest.mark.parametrize instead.
--
-- Decorate a test generator to pass a SphinxTestApp as the first argument to
-- the test generator when it's executed.
-- """
-- def generator(func):
-- @wraps(func)
-- def deco(*args2, **kwargs2):
-- status, warning = StringIO(), StringIO()
-- kwargs['status'] = status
-- kwargs['warning'] = warning
-- app = SphinxTestApp(*args, **kwargs)
-- try:
-- for item in func(app, status, warning, *args2, **kwargs2):
-- yield item
-- finally:
-- app.cleanup()
-- return deco
-- return generator
--
--
--def skip_if(condition, msg=None):
-- """
-- **DEPRECATED**: use pytest.mark.skipif instead.
--
-- Decorator to skip test if condition is true.
-- """
-- return pytest.mark.skipif(condition, reason=(msg or 'conditional skip'))
--
--
--def skip_unless(condition, msg=None):
-- """
-- **DEPRECATED**: use pytest.mark.skipif instead.
--
-- Decorator to skip test if condition is false.
-- """
-- return pytest.mark.skipif(not condition, reason=(msg or 'conditional skip'))
--
--
--def with_tempdir(func):
-- """
-- **DEPRECATED**: use tempdir fixture instead.
-- """
-- return func
--
--
--def raises(exc, func, *args, **kwds):
-- """
-- **DEPRECATED**: use pytest.raises instead.
--
-- Raise AssertionError if ``func(*args, **kwds)`` does not raise *exc*.
-- """
-- with pytest.raises(exc):
-- func(*args, **kwds)
--
--
--def raises_msg(exc, msg, func, *args, **kwds):
-- """
-- **DEPRECATED**: use pytest.raises instead.
--
-- Raise AssertionError if ``func(*args, **kwds)`` does not raise *exc*,
-- and check if the message contains *msg*.
-- """
-- with pytest.raises(exc) as excinfo:
-- func(*args, **kwds)
-- assert msg in str(excinfo.value)
--
--
--def assert_true(v1, msg=''):
-- """
-- **DEPRECATED**: use assert instead.
-- """
-- assert v1, msg
--
--
--def assert_equal(v1, v2, msg=''):
-- """
-- **DEPRECATED**: use assert instead.
-- """
-- assert v1 == v2, msg
--
--
--def assert_in(x, thing, msg=''):
-- """
-- **DEPRECATED**: use assert instead.
-- """
-- if x not in thing:
-- assert False, msg or '%r is not in %r' % (x, thing)
--
--
--def assert_not_in(x, thing, msg=''):
-- """
-- **DEPRECATED**: use assert instead.
-- """
-- if x in thing:
-- assert False, msg or '%r is in %r' % (x, thing)
--
--
--class ListOutput(object):
-- """
-- File-like object that collects written text in a list.
-- """
-- def __init__(self, name):
-- self.name = name
-- self.content = []
--
-- def reset(self):
-- del self.content[:]
--
-- def write(self, text):
-- self.content.append(text)
--
--
--# **DEPRECATED**: use pytest.skip instead.
--SkipTest = pytest.skip.Exception
--
--
--class _DeprecationWrapper(object):
-- def __init__(self, mod, deprecated):
-- self._mod = mod
-- self._deprecated = deprecated
--
-- def __getattr__(self, attr):
-- if attr in self._deprecated:
-- obj, instead = self._deprecated[attr]
-- warnings.warn("tests/util.py::%s is deprecated and will be "
-- "removed in Sphinx 1.7, please use %s instead."
-- % (attr, instead),
-- RemovedInSphinx17Warning, stacklevel=2)
-- return obj
-- return getattr(self._mod, attr)
--
--
--sys.modules[__name__] = _DeprecationWrapper(sys.modules[__name__], dict( # type: ignore
-- with_app=(pytest.mark.sphinx, 'pytest.mark.sphinx'),
-- TestApp=(SphinxTestApp, 'SphinxTestApp'),
-- gen_with_app=(gen_with_app, 'pytest.mark.parametrize'),
-- skip_if=(skip_if, 'pytest.skipif'),
-- skip_unless=(skip_unless, 'pytest.skipif'),
-- with_tempdir=(with_tempdir, 'tmpdir pytest fixture'),
-- raises=(raises, 'pytest.raises'),
-- raises_msg=(raises_msg, 'pytest.raises'),
-- assert_true=(assert_true, 'assert'),
-- assert_equal=(assert_equal, 'assert'),
-- assert_in=(assert_in, 'assert'),
-- assert_not_in=(assert_not_in, 'assert'),
-- ListOutput=(ListOutput, 'StringIO'),
-- SkipTest=(SkipTest, 'pytest.skip'),
--))
diff --git a/debian/patches/tests_fix_import.diff b/debian/patches/tests_fix_import.diff
deleted file mode 100644
index 7d8d7bf..0000000
--- a/debian/patches/tests_fix_import.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-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