New Upstream Snapshot - sphinxcontrib-qthelp
Ready changes
Summary
Merged new upstream version: 1.0.3+git20220704.1.42ca78b (was: 1.0.3).
Resulting package
Built on 2022-10-21T05:57 (took 6m35s)
The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:
apt install -t fresh-snapshots python3-sphinxcontrib.qthelp
Lintian Result
Diff
diff --git a/PKG-INFO b/PKG-INFO
index 2067ec7..400b387 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,15 +1,12 @@
Metadata-Version: 2.1
Name: sphinxcontrib-qthelp
-Version: 1.0.3
+Version: 1.0.4.dev20221021
Summary: sphinxcontrib-qthelp is a sphinx extension which outputs QtHelp document.
Home-page: http://sphinx-doc.org/
+Download-URL: https://pypi.org/project/sphinxcontrib-qthelp/
Author: Georg Brandl
Author-email: georg@python.org
License: BSD
-Download-URL: https://pypi.org/project/sphinxcontrib-qthelp/
-Description:
- sphinxcontrib-qthelp is a sphinx extension which outputs QtHelp document.
-
Platform: any
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Console
@@ -30,5 +27,9 @@ Classifier: Topic :: Documentation :: Sphinx
Classifier: Topic :: Text Processing
Classifier: Topic :: Utilities
Requires-Python: >=3.5
-Provides-Extra: test
Provides-Extra: lint
+Provides-Extra: test
+License-File: LICENSE
+
+
+sphinxcontrib-qthelp is a sphinx extension which outputs QtHelp document.
diff --git a/debian/changelog b/debian/changelog
index a326622..ed2a6d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+sphinxcontrib-qthelp (1.0.3+git20220704.1.42ca78b-1) UNRELEASED; urgency=low
+
+ * New upstream snapshot.
+ * Drop patch sphinx_5.0.patch, present upstream.
+
+ -- Debian Janitor <janitor@jelmer.uk> Fri, 21 Oct 2022 05:52:14 -0000
+
sphinxcontrib-qthelp (1.0.3-4) unstable; urgency=medium
* Add a patch to fix tests with Sphinx 5 (closes: #1013387).
diff --git a/debian/patches/entry_points.patch b/debian/patches/entry_points.patch
index 71f9a01..ec43c29 100644
--- a/debian/patches/entry_points.patch
+++ b/debian/patches/entry_points.patch
@@ -1,5 +1,7 @@
---- a/setup.cfg
-+++ b/setup.cfg
+Index: sphinxcontrib-qthelp.git/setup.cfg
+===================================================================
+--- sphinxcontrib-qthelp.git.orig/setup.cfg
++++ sphinxcontrib-qthelp.git/setup.cfg
@@ -28,3 +28,6 @@ exclude = .git,.tox,.venv
[mypy]
ignore_missing_imports = True
diff --git a/debian/patches/series b/debian/patches/series
index eceba68..47c420c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
entry_points.patch
-sphinx_5.0.patch
diff --git a/debian/patches/sphinx_5.0.patch b/debian/patches/sphinx_5.0.patch
deleted file mode 100644
index 716d3fb..0000000
--- a/debian/patches/sphinx_5.0.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From: MeggyCal <MeggyCal@users.noreply.github.com>
-Date: Wed, 1 Jun 2022 10:35:11 +0200
-Subject: Fix tests with Sphinx 5.0
-
-Origin: https://github.com/sphinx-doc/sphinxcontrib-qthelp/pull/14
----
- tests/test_qthelp.py | 20 ++++++++++----------
- 1 file changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/tests/test_qthelp.py b/tests/test_qthelp.py
-index fd83241..4c5f77d 100644
---- a/tests/test_qthelp.py
-+++ b/tests/test_qthelp.py
-@@ -17,7 +17,7 @@ from sphinx.testing.util import etree_parse
- def test_qthelp_basic(app, status, warning):
- app.builder.build_all()
-
-- qhp = (app.outdir / 'Python.qhp').text()
-+ qhp = (app.outdir / 'Python.qhp').read_text()
- assert '<customFilter name="Python ">' in qhp
- assert '<filterAttribute>Python</filterAttribute>' in qhp
- assert '<filterAttribute></filterAttribute>' in qhp
-@@ -26,7 +26,7 @@ def test_qthelp_basic(app, status, warning):
- assert '<file>index.html</file>' in qhp
- assert '<file>_static/basic.css</file>' in qhp
-
-- qhcp = (app.outdir / 'Python.qhcp').text()
-+ qhcp = (app.outdir / 'Python.qhcp').read_text()
- assert '<title>Python documentation</title>' in qhcp
- assert '<homePage>qthelp://org.sphinx.python/doc/index.html</homePage>' in qhcp
- assert '<startPage>qthelp://org.sphinx.python/doc/index.html</startPage>' in qhcp
-@@ -91,10 +91,10 @@ def test_qthelp_namespace(app, status, warning):
- # default namespace
- app.builder.build_all()
-
-- qhp = (app.outdir / 'Python.qhp').text()
-+ qhp = (app.outdir / 'Python.qhp').read_text()
- assert '<namespace>org.sphinx.python</namespace>' in qhp
-
-- qhcp = (app.outdir / 'Python.qhcp').text()
-+ qhcp = (app.outdir / 'Python.qhcp').read_text()
- assert '<homePage>qthelp://org.sphinx.python/doc/index.html</homePage>' in qhcp
- assert '<startPage>qthelp://org.sphinx.python/doc/index.html</startPage>' in qhcp
-
-@@ -102,10 +102,10 @@ def test_qthelp_namespace(app, status, warning):
- app.config.qthelp_namespace = 'org.sphinx-doc.sphinx'
- app.builder.build_all()
-
-- qhp = (app.outdir / 'Python.qhp').text()
-+ qhp = (app.outdir / 'Python.qhp').read_text()
- assert '<namespace>org.sphinx-doc.sphinx</namespace>' in qhp
-
-- qhcp = (app.outdir / 'Python.qhcp').text()
-+ qhcp = (app.outdir / 'Python.qhcp').read_text()
- assert '<homePage>qthelp://org.sphinx-doc.sphinx/doc/index.html</homePage>' in qhcp
- assert '<startPage>qthelp://org.sphinx-doc.sphinx/doc/index.html</startPage>' in qhcp
-
-@@ -115,10 +115,10 @@ def test_qthelp_title(app, status, warning):
- # default title
- app.builder.build_all()
-
-- qhp = (app.outdir / 'Python.qhp').text()
-+ qhp = (app.outdir / 'Python.qhp').read_text()
- assert '<section title="Python documentation" ref="index.html">' in qhp
-
-- qhcp = (app.outdir / 'Python.qhcp').text()
-+ qhcp = (app.outdir / 'Python.qhcp').read_text()
- assert '<title>Python documentation</title>' in qhcp
-
- # give a title
-@@ -126,9 +126,9 @@ def test_qthelp_title(app, status, warning):
- app.config.html_short_title = 'Sphinx <b>"short"</b> title'
- app.builder.build_all()
-
-- qhp = (app.outdir / 'Python.qhp').text()
-+ qhp = (app.outdir / 'Python.qhp').read_text()
- assert ('<section title="Sphinx <b>"full"</b> title" ref="index.html">'
- in qhp)
-
-- qhcp = (app.outdir / 'Python.qhcp').text()
-+ qhcp = (app.outdir / 'Python.qhcp').read_text()
- assert '<title>Sphinx <b>"short"</b> title</title>' in qhcp
diff --git a/setup.cfg b/setup.cfg
index db3eadd..926e735 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
[egg_info]
-tag_build =
+tag_build = .dev-20221021
tag_date = 0
[aliases]
diff --git a/sphinxcontrib/qthelp/__init__.py b/sphinxcontrib/qthelp/__init__.py
index 320d81d..54e7a52 100644
--- a/sphinxcontrib/qthelp/__init__.py
+++ b/sphinxcontrib/qthelp/__init__.py
@@ -86,6 +86,10 @@ class QtHelpBuilder(StandaloneHTMLBuilder):
return self.config.qthelp_theme, self.config.qthelp_theme_options
def handle_finish(self) -> None:
+ self.epilog = self.epilog % {
+ 'outdir': '%(outdir)s',
+ 'project': self.config.qthelp_basename,
+ }
self.build_qhp(self.outdir, self.config.qthelp_basename)
def build_qhp(self, outdir: str, outname: str) -> None:
@@ -102,7 +106,7 @@ class QtHelpBuilder(StandaloneHTMLBuilder):
for indexname, indexcls, content, collapse in self.domain_indices:
item = section_template % {'title': indexcls.localname,
- 'ref': '%s.html' % indexname}
+ 'ref': indexname + self.out_suffix}
sections.append(' ' * 4 * 4 + item)
sections = '\n'.join(sections) # type: ignore
@@ -138,7 +142,7 @@ class QtHelpBuilder(StandaloneHTMLBuilder):
homepage = 'qthelp://' + posixpath.join(
nspace, 'doc', self.get_target_uri(self.config.master_doc))
- startpage = 'qthelp://' + posixpath.join(nspace, 'doc', 'index.html')
+ startpage = 'qthelp://' + posixpath.join(nspace, 'doc', 'index%s' % self.link_suffix)
logger.info(__('writing collection project file...'))
with open(path.join(outdir, outname + '.qhcp'), 'w', encoding='utf-8') as f:
diff --git a/sphinxcontrib/qthelp/version.py b/sphinxcontrib/qthelp/version.py
index 9d1e6b8..6386874 100644
--- a/sphinxcontrib/qthelp/version.py
+++ b/sphinxcontrib/qthelp/version.py
@@ -6,5 +6,5 @@
:license: BSD, see LICENSE for details.
"""
-__version__ = '1.0.3'
+__version__ = '1.0.4'
__version_info__ = tuple(map(int, __version__.split('.')))
diff --git a/sphinxcontrib_qthelp.egg-info/PKG-INFO b/sphinxcontrib_qthelp.egg-info/PKG-INFO
index 2067ec7..400b387 100644
--- a/sphinxcontrib_qthelp.egg-info/PKG-INFO
+++ b/sphinxcontrib_qthelp.egg-info/PKG-INFO
@@ -1,15 +1,12 @@
Metadata-Version: 2.1
Name: sphinxcontrib-qthelp
-Version: 1.0.3
+Version: 1.0.4.dev20221021
Summary: sphinxcontrib-qthelp is a sphinx extension which outputs QtHelp document.
Home-page: http://sphinx-doc.org/
+Download-URL: https://pypi.org/project/sphinxcontrib-qthelp/
Author: Georg Brandl
Author-email: georg@python.org
License: BSD
-Download-URL: https://pypi.org/project/sphinxcontrib-qthelp/
-Description:
- sphinxcontrib-qthelp is a sphinx extension which outputs QtHelp document.
-
Platform: any
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Console
@@ -30,5 +27,9 @@ Classifier: Topic :: Documentation :: Sphinx
Classifier: Topic :: Text Processing
Classifier: Topic :: Utilities
Requires-Python: >=3.5
-Provides-Extra: test
Provides-Extra: lint
+Provides-Extra: test
+License-File: LICENSE
+
+
+sphinxcontrib-qthelp is a sphinx extension which outputs QtHelp document.
diff --git a/sphinxcontrib_qthelp.egg-info/requires.txt b/sphinxcontrib_qthelp.egg-info/requires.txt
index d7f80e8..f1bc0ab 100644
--- a/sphinxcontrib_qthelp.egg-info/requires.txt
+++ b/sphinxcontrib_qthelp.egg-info/requires.txt
@@ -1,8 +1,8 @@
[lint]
+docutils-stubs
flake8
mypy
-docutils-stubs
[test]
pytest
diff --git a/tests/test_qthelp.py b/tests/test_qthelp.py
index fd83241..4c5f77d 100644
--- a/tests/test_qthelp.py
+++ b/tests/test_qthelp.py
@@ -17,7 +17,7 @@ from sphinx.testing.util import etree_parse
def test_qthelp_basic(app, status, warning):
app.builder.build_all()
- qhp = (app.outdir / 'Python.qhp').text()
+ qhp = (app.outdir / 'Python.qhp').read_text()
assert '<customFilter name="Python ">' in qhp
assert '<filterAttribute>Python</filterAttribute>' in qhp
assert '<filterAttribute></filterAttribute>' in qhp
@@ -26,7 +26,7 @@ def test_qthelp_basic(app, status, warning):
assert '<file>index.html</file>' in qhp
assert '<file>_static/basic.css</file>' in qhp
- qhcp = (app.outdir / 'Python.qhcp').text()
+ qhcp = (app.outdir / 'Python.qhcp').read_text()
assert '<title>Python documentation</title>' in qhcp
assert '<homePage>qthelp://org.sphinx.python/doc/index.html</homePage>' in qhcp
assert '<startPage>qthelp://org.sphinx.python/doc/index.html</startPage>' in qhcp
@@ -91,10 +91,10 @@ def test_qthelp_namespace(app, status, warning):
# default namespace
app.builder.build_all()
- qhp = (app.outdir / 'Python.qhp').text()
+ qhp = (app.outdir / 'Python.qhp').read_text()
assert '<namespace>org.sphinx.python</namespace>' in qhp
- qhcp = (app.outdir / 'Python.qhcp').text()
+ qhcp = (app.outdir / 'Python.qhcp').read_text()
assert '<homePage>qthelp://org.sphinx.python/doc/index.html</homePage>' in qhcp
assert '<startPage>qthelp://org.sphinx.python/doc/index.html</startPage>' in qhcp
@@ -102,10 +102,10 @@ def test_qthelp_namespace(app, status, warning):
app.config.qthelp_namespace = 'org.sphinx-doc.sphinx'
app.builder.build_all()
- qhp = (app.outdir / 'Python.qhp').text()
+ qhp = (app.outdir / 'Python.qhp').read_text()
assert '<namespace>org.sphinx-doc.sphinx</namespace>' in qhp
- qhcp = (app.outdir / 'Python.qhcp').text()
+ qhcp = (app.outdir / 'Python.qhcp').read_text()
assert '<homePage>qthelp://org.sphinx-doc.sphinx/doc/index.html</homePage>' in qhcp
assert '<startPage>qthelp://org.sphinx-doc.sphinx/doc/index.html</startPage>' in qhcp
@@ -115,10 +115,10 @@ def test_qthelp_title(app, status, warning):
# default title
app.builder.build_all()
- qhp = (app.outdir / 'Python.qhp').text()
+ qhp = (app.outdir / 'Python.qhp').read_text()
assert '<section title="Python documentation" ref="index.html">' in qhp
- qhcp = (app.outdir / 'Python.qhcp').text()
+ qhcp = (app.outdir / 'Python.qhcp').read_text()
assert '<title>Python documentation</title>' in qhcp
# give a title
@@ -126,9 +126,9 @@ def test_qthelp_title(app, status, warning):
app.config.html_short_title = 'Sphinx <b>"short"</b> title'
app.builder.build_all()
- qhp = (app.outdir / 'Python.qhp').text()
+ qhp = (app.outdir / 'Python.qhp').read_text()
assert ('<section title="Sphinx <b>"full"</b> title" ref="index.html">'
in qhp)
- qhcp = (app.outdir / 'Python.qhcp').text()
+ qhcp = (app.outdir / 'Python.qhcp').read_text()
assert '<title>Sphinx <b>"short"</b> title</title>' in qhcp
diff --git a/tox.ini b/tox.ini
index 4a831a4..2e25e5c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,14 @@
[tox]
-envlist=flake8,mypy,py35,py36,py37,py38,py39
+skip_missing_interpreters = true
+envlist=flake8,mypy,py36,py37,py38,py39,py310-dev
+
+[gh-actions]
+python =
+ 3.6: py36
+ 3.7: py37
+ 3.8: py38
+ 3.9: py39
+ 3.10: py310-dev
[testenv]
deps=
Debdiff
[The following lists of changes regard files as different if they have different names, permissions or owners.]
Files in second set of .debs but not in first
-rw-r--r-- root/root /usr/lib/python3/dist-packages/sphinxcontrib_qthelp-1.0.4.dev20221021-nspkg.pth -rw-r--r-- root/root /usr/lib/python3/dist-packages/sphinxcontrib_qthelp-1.0.4.dev20221021.egg-info/PKG-INFO -rw-r--r-- root/root /usr/lib/python3/dist-packages/sphinxcontrib_qthelp-1.0.4.dev20221021.egg-info/dependency_links.txt -rw-r--r-- root/root /usr/lib/python3/dist-packages/sphinxcontrib_qthelp-1.0.4.dev20221021.egg-info/entry_points.txt -rw-r--r-- root/root /usr/lib/python3/dist-packages/sphinxcontrib_qthelp-1.0.4.dev20221021.egg-info/namespace_packages.txt -rw-r--r-- root/root /usr/lib/python3/dist-packages/sphinxcontrib_qthelp-1.0.4.dev20221021.egg-info/not-zip-safe -rw-r--r-- root/root /usr/lib/python3/dist-packages/sphinxcontrib_qthelp-1.0.4.dev20221021.egg-info/requires.txt -rw-r--r-- root/root /usr/lib/python3/dist-packages/sphinxcontrib_qthelp-1.0.4.dev20221021.egg-info/top_level.txt
Files in first set of .debs but not in second
-rw-r--r-- root/root /usr/lib/python3/dist-packages/sphinxcontrib_qthelp-1.0.3-nspkg.pth -rw-r--r-- root/root /usr/lib/python3/dist-packages/sphinxcontrib_qthelp-1.0.3.egg-info/PKG-INFO -rw-r--r-- root/root /usr/lib/python3/dist-packages/sphinxcontrib_qthelp-1.0.3.egg-info/dependency_links.txt -rw-r--r-- root/root /usr/lib/python3/dist-packages/sphinxcontrib_qthelp-1.0.3.egg-info/entry_points.txt -rw-r--r-- root/root /usr/lib/python3/dist-packages/sphinxcontrib_qthelp-1.0.3.egg-info/namespace_packages.txt -rw-r--r-- root/root /usr/lib/python3/dist-packages/sphinxcontrib_qthelp-1.0.3.egg-info/not-zip-safe -rw-r--r-- root/root /usr/lib/python3/dist-packages/sphinxcontrib_qthelp-1.0.3.egg-info/requires.txt -rw-r--r-- root/root /usr/lib/python3/dist-packages/sphinxcontrib_qthelp-1.0.3.egg-info/top_level.txt
No differences were encountered in the control files