diff -Nru pywps-4.2.6/debian/changelog pywps-4.2.7/debian/changelog --- pywps-4.2.6/debian/changelog 2020-07-28 03:49:06.000000000 +0000 +++ pywps-4.2.7/debian/changelog 2020-08-05 14:07:33.000000000 +0000 @@ -1,3 +1,11 @@ +pywps (4.2.7-1) unstable; urgency=medium + + * New upstream release. + * Add lintian override for redundant-globbing-patterns. + * Drop unused override for embedded-javascript-library. + + -- Bas Couwenberg Wed, 05 Aug 2020 16:07:33 +0200 + pywps (4.2.6-2) unstable; urgency=medium * Switch libapache2-mod-wsgi dependency to libapache2-mod-wsgi-py3. diff -Nru pywps-4.2.6/debian/pywps-doc.lintian-overrides pywps-4.2.7/debian/pywps-doc.lintian-overrides --- pywps-4.2.6/debian/pywps-doc.lintian-overrides 2020-07-28 03:49:06.000000000 +0000 +++ pywps-4.2.7/debian/pywps-doc.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -# sphinx does not provide language_data.js -embedded-javascript-library */language_data.js please use sphinx - diff -Nru pywps-4.2.6/debian/source/lintian-overrides pywps-4.2.7/debian/source/lintian-overrides --- pywps-4.2.6/debian/source/lintian-overrides 2019-03-30 20:30:23.000000000 +0000 +++ pywps-4.2.7/debian/source/lintian-overrides 2020-08-05 14:07:33.000000000 +0000 @@ -1,3 +1,6 @@ # Not worth the effort testsuite-autopkgtest-missing +# False positive +redundant-globbing-patterns * + diff -Nru pywps-4.2.6/pywps/ext_autodoc.py pywps-4.2.7/pywps/ext_autodoc.py --- pywps-4.2.6/pywps/ext_autodoc.py 2020-07-03 17:29:10.000000000 +0000 +++ pywps-4.2.7/pywps/ext_autodoc.py 2020-08-05 09:54:25.000000000 +0000 @@ -8,6 +8,21 @@ from pywps.app.Common import Metadata +class MetadataUrl(Metadata): + """Metadata subclass to allow anonymous links generation. + + Useful to avoid Sphinx "Duplicate explicit target name" warning. + + See https://docutils.sourceforge.io/docs/ref/rst/restructuredtext.html#anonymous-hyperlinks. + """ + + def __init__(self, title, href=None, role=None, type_='simple', + anonymous=False): + super().__init__(title, href=href, role=role, type_=type_) + self.anonymous = anonymous + "Whether to create anonymous link (boolean)." + + class ProcessDocumenter(ClassDocumenter): """Sphinx autodoc ClassDocumenter subclass that understands the pywps.Process class. @@ -126,8 +141,11 @@ title, href = m['title'], m['href'] else: title, href = None, None + extra_underscore = "" + if isinstance(m, MetadataUrl): + extra_underscore = "_" if m.anonymous else "" if title and href: - ref.append(u" - `{} <{}>`_".format(title, href)) + ref.append(u" - `{} <{}>`_{}".format(title, href, extra_underscore)) hasref = True ref.append('') diff -Nru pywps-4.2.6/pywps/__init__.py pywps-4.2.7/pywps/__init__.py --- pywps-4.2.6/pywps/__init__.py 2020-07-03 17:29:10.000000000 +0000 +++ pywps-4.2.7/pywps/__init__.py 2020-08-05 09:54:25.000000000 +0000 @@ -9,7 +9,7 @@ from lxml.builder import ElementMaker -__version__ = '4.2.2' +__version__ = '4.2.7' LOGGER = logging.getLogger('PYWPS') LOGGER.debug('setting core variables') diff -Nru pywps-4.2.6/pywps/tests.py pywps-4.2.7/pywps/tests.py --- pywps-4.2.6/pywps/tests.py 2020-07-03 17:29:10.000000000 +0000 +++ pywps-4.2.7/pywps/tests.py 2020-08-05 09:54:25.000000000 +0000 @@ -12,6 +12,7 @@ from pywps.inout import LiteralInput, LiteralOutput, ComplexInput, ComplexOutput, BoundingBoxInput, BoundingBoxOutput from pywps.inout import Format from pywps.app.Common import Metadata +from pywps.ext_autodoc import MetadataUrl import re @@ -75,7 +76,10 @@ version="4.0", metadata=[Metadata('PyWPS docs', 'https://pywps.org'), Metadata('NumPy docstring conventions', - 'https://github.com/numpy/numpy/blob/master/doc/HOWTO_DOCUMENT.rst.txt')], + 'https://github.com/numpy/numpy/blob/master/doc/HOWTO_DOCUMENT.rst.txt'), + MetadataUrl('Duplicate label', 'http://one.example.com', anonymous=True), + MetadataUrl('Duplicate label', 'http://two.example.com', anonymous=True), + ], inputs=inputs, outputs=outputs, ) diff -Nru pywps-4.2.6/VERSION.txt pywps-4.2.7/VERSION.txt --- pywps-4.2.6/VERSION.txt 2020-07-03 17:29:10.000000000 +0000 +++ pywps-4.2.7/VERSION.txt 2020-08-05 09:54:25.000000000 +0000 @@ -1 +1 @@ -4.2.6 +4.2.7