Hello community,
here is the log from the commit of package python-sphinxcontrib-htmlhelp for
openSUSE:Factory checked in at 2020-03-08 22:21:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-sphinxcontrib-htmlhelp (Old)
and /work/SRC/openSUSE:Factory/.python-sphinxcontrib-htmlhelp.new.26092
(New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-sphinxcontrib-htmlhelp"
Sun Mar 8 22:21:43 2020 rev:2 rq:780398 version:1.0.3
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-sphinxcontrib-htmlhelp/python-sphinxcontrib-htmlhelp.changes
2019-06-18 14:47:15.897713759 +0200
+++
/work/SRC/openSUSE:Factory/.python-sphinxcontrib-htmlhelp.new.26092/python-sphinxcontrib-htmlhelp.changes
2020-03-08 22:21:45.195989196 +0100
@@ -1,0 +2,6 @@
+Fri Feb 28 21:59:51 UTC 2020 - Dirk Mueller <[email protected]>
+
+- update to 1.0.3:
+ * #6685: htmlhelp builder should generate HTML4 docs instead of HTML5
+
+-------------------------------------------------------------------
Old:
----
sphinxcontrib-htmlhelp-1.0.2.tar.gz
New:
----
sphinxcontrib-htmlhelp-1.0.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-sphinxcontrib-htmlhelp.spec ++++++
--- /var/tmp/diff_new_pack.fPYkqe/_old 2020-03-08 22:21:45.751989539 +0100
+++ /var/tmp/diff_new_pack.fPYkqe/_new 2020-03-08 22:21:45.751989539 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-sphinxcontrib-htmlhelp
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -27,7 +27,7 @@
%bcond_with test
%endif
Name: python-sphinxcontrib-htmlhelp%{psuffix}
-Version: 1.0.2
+Version: 1.0.3
Release: 0
Summary: Sphinx contrib extension to generate html help files
License: BSD-2-Clause
@@ -52,7 +52,6 @@
%prep
%setup -q -n sphinxcontrib-htmlhelp-%{version}
-rm -r tests/__pycache__
%build
%python_build
++++++ sphinxcontrib-htmlhelp-1.0.2.tar.gz ->
sphinxcontrib-htmlhelp-1.0.3.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sphinxcontrib-htmlhelp-1.0.2/CHANGES
new/sphinxcontrib-htmlhelp-1.0.3/CHANGES
--- old/sphinxcontrib-htmlhelp-1.0.2/CHANGES 2019-04-11 18:01:56.000000000
+0200
+++ new/sphinxcontrib-htmlhelp-1.0.3/CHANGES 2020-02-21 18:01:08.000000000
+0100
@@ -1,4 +1,9 @@
-Release 1.0.2 (unreleased)
+Release 1.0.3 (unreleased)
+==========================
+
+* #6685: htmlhelp builder should generate HTML4 docs instead of HTML5
+
+Release 1.0.2 (2019-04-12)
==========================
* #6229: htmlhelp builder generates invalid .hhc file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sphinxcontrib-htmlhelp-1.0.2/PKG-INFO
new/sphinxcontrib-htmlhelp-1.0.3/PKG-INFO
--- old/sphinxcontrib-htmlhelp-1.0.2/PKG-INFO 2019-04-11 18:02:35.000000000
+0200
+++ new/sphinxcontrib-htmlhelp-1.0.3/PKG-INFO 2020-02-21 18:09:56.589685000
+0100
@@ -1,16 +1,14 @@
Metadata-Version: 2.1
Name: sphinxcontrib-htmlhelp
-Version: 1.0.2
-Summary:
-sphinxcontrib-htmlhelp is a sphinx extension which ...
-
+Version: 1.0.3
+Summary: sphinxcontrib-htmlhelp is a sphinx extension which renders HTML help
files
Home-page: http://sphinx-doc.org/
Author: Georg Brandl
Author-email: [email protected]
License: BSD
Download-URL: https://pypi.org/project/sphinxcontrib-htmlhelp/
Description:
- sphinxcontrib-htmlhelp is a sphinx extension which ...
+ sphinxcontrib-htmlhelp is a sphinx extension which renders HTML help
files.
Platform: any
Classifier: Development Status :: 5 - Production/Stable
@@ -32,4 +30,6 @@
Classifier: Topic :: Text Processing
Classifier: Topic :: Utilities
Requires-Python: >=3.5
+Description-Content-Type: text/x-rst
Provides-Extra: test
+Provides-Extra: lint
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sphinxcontrib-htmlhelp-1.0.2/setup.cfg
new/sphinxcontrib-htmlhelp-1.0.3/setup.cfg
--- old/sphinxcontrib-htmlhelp-1.0.2/setup.cfg 2019-04-11 18:02:35.000000000
+0200
+++ new/sphinxcontrib-htmlhelp-1.0.3/setup.cfg 2020-02-21 18:09:56.590213500
+0100
@@ -27,4 +27,5 @@
[mypy]
ignore_missing_imports = True
+strict_optional = False
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sphinxcontrib-htmlhelp-1.0.2/setup.py
new/sphinxcontrib-htmlhelp-1.0.3/setup.py
--- old/sphinxcontrib-htmlhelp-1.0.2/setup.py 2019-04-07 11:52:42.000000000
+0200
+++ new/sphinxcontrib-htmlhelp-1.0.3/setup.py 2020-02-21 18:08:59.000000000
+0100
@@ -3,16 +3,19 @@
from setuptools import setup, find_packages
long_desc = '''
-sphinxcontrib-htmlhelp is a sphinx extension which ...
+sphinxcontrib-htmlhelp is a sphinx extension which renders HTML help files.
'''
extras_require = {
'test': [
'pytest',
- 'flake8',
- 'mypy',
'html5lib',
],
+ 'lint': [
+ 'flake8',
+ 'mypy',
+ 'docutils-stubs',
+ ]
}
@@ -36,8 +39,9 @@
license='BSD',
author='Georg Brandl',
author_email='[email protected]',
- description=long_desc,
+ description="sphinxcontrib-htmlhelp is a sphinx extension which renders
HTML help files",
long_description=long_desc,
+ long_description_content_type='text/x-rst',
zip_safe=False,
classifiers=[
'Development Status :: 5 - Production/Stable',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sphinxcontrib-htmlhelp-1.0.2/sphinxcontrib/__init__.py
new/sphinxcontrib-htmlhelp-1.0.3/sphinxcontrib/__init__.py
--- old/sphinxcontrib-htmlhelp-1.0.2/sphinxcontrib/__init__.py 2019-04-07
11:52:42.000000000 +0200
+++ new/sphinxcontrib-htmlhelp-1.0.3/sphinxcontrib/__init__.py 2020-02-21
17:56:16.000000000 +0100
@@ -9,4 +9,7 @@
:license: BSD, see LICENSE for details.
"""
-__import__('pkg_resources').declare_namespace(__name__)
+import pkg_resources
+
+
+pkg_resources.declare_namespace(__name__)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sphinxcontrib-htmlhelp-1.0.2/sphinxcontrib/htmlhelp/__init__.py
new/sphinxcontrib-htmlhelp-1.0.3/sphinxcontrib/htmlhelp/__init__.py
--- old/sphinxcontrib-htmlhelp-1.0.2/sphinxcontrib/htmlhelp/__init__.py
2019-04-11 18:01:56.000000000 +0200
+++ new/sphinxcontrib-htmlhelp-1.0.3/sphinxcontrib/htmlhelp/__init__.py
2020-02-21 17:56:16.000000000 +0100
@@ -12,7 +12,7 @@
import os
import warnings
from os import path
-from typing import Any, Dict, IO, List, Tuple
+from typing import Any, Dict, IO, List, Set, Tuple, Type
from docutils import nodes
from docutils.nodes import Element, Node, document
@@ -30,6 +30,7 @@
from sphinx.util.nodes import NodeMatcher
from sphinx.util.osutil import make_filename_from_project, relpath
from sphinx.util.template import SphinxRenderer
+from sphinx.writers.html import HTMLTranslator
from sphinxcontrib.htmlhelp.version import __version__
@@ -67,7 +68,7 @@
'no_NB': (0x414, 'cp1252'),
'pl': (0x415, 'cp1250'),
'pt_BR': (0x416, 'cp1252'),
- 'ru': (0x419, 'cp1251'),
+ 'ru': (0x419, 'windows-1251'), # emit as <meta chaset='...'>
'sk': (0x41b, 'cp1250'),
'sl': (0x424, 'cp1250'),
'sv': (0x41d, 'cp1252'),
@@ -169,6 +170,15 @@
if locale is not None:
self.lcid, self.encoding = locale
+ @property
+ def default_translator_class(self) -> "Type[nodes.NodeVisitor]": # type:
ignore
+ # Use HTML4 writer always
+ return HTMLTranslator
+
+ def prepare_writing(self, docnames: Set[str]) -> None:
+ super().prepare_writing(docnames)
+ self.globalcontext['html5_doctype'] = False
+
def open_file(self, outdir: str, basename: str, mode: str = 'w') -> IO:
# open a file with the correct encoding for the selected language
warnings.warn('HTMLHelpBuilder.open_file() is deprecated.',
@@ -306,7 +316,7 @@
app.add_builder(HTMLHelpBuilder)
app.add_message_catalog(__name__, path.join(package_dir, 'locales'))
- app.add_config_value('htmlhelp_basename', default_htmlhelp_basename, None)
+ app.add_config_value('htmlhelp_basename', default_htmlhelp_basename, '')
app.add_config_value('htmlhelp_file_suffix', None, 'html', [str])
app.add_config_value('htmlhelp_link_suffix', None, 'html', [str])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sphinxcontrib-htmlhelp-1.0.2/sphinxcontrib/htmlhelp/version.py
new/sphinxcontrib-htmlhelp-1.0.3/sphinxcontrib/htmlhelp/version.py
--- old/sphinxcontrib-htmlhelp-1.0.2/sphinxcontrib/htmlhelp/version.py
2019-04-07 11:52:42.000000000 +0200
+++ new/sphinxcontrib-htmlhelp-1.0.3/sphinxcontrib/htmlhelp/version.py
2020-02-21 18:01:08.000000000 +0100
@@ -6,5 +6,5 @@
:license: BSD, see LICENSE for details.
"""
-__version__ = '1.0.2'
+__version__ = '1.0.3'
__version_info__ = tuple(map(int, __version__.split('.')))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sphinxcontrib-htmlhelp-1.0.2/sphinxcontrib_htmlhelp.egg-info/PKG-INFO
new/sphinxcontrib-htmlhelp-1.0.3/sphinxcontrib_htmlhelp.egg-info/PKG-INFO
--- old/sphinxcontrib-htmlhelp-1.0.2/sphinxcontrib_htmlhelp.egg-info/PKG-INFO
2019-04-11 18:02:34.000000000 +0200
+++ new/sphinxcontrib-htmlhelp-1.0.3/sphinxcontrib_htmlhelp.egg-info/PKG-INFO
2020-02-21 18:09:56.000000000 +0100
@@ -1,16 +1,14 @@
Metadata-Version: 2.1
Name: sphinxcontrib-htmlhelp
-Version: 1.0.2
-Summary:
-sphinxcontrib-htmlhelp is a sphinx extension which ...
-
+Version: 1.0.3
+Summary: sphinxcontrib-htmlhelp is a sphinx extension which renders HTML help
files
Home-page: http://sphinx-doc.org/
Author: Georg Brandl
Author-email: [email protected]
License: BSD
Download-URL: https://pypi.org/project/sphinxcontrib-htmlhelp/
Description:
- sphinxcontrib-htmlhelp is a sphinx extension which ...
+ sphinxcontrib-htmlhelp is a sphinx extension which renders HTML help
files.
Platform: any
Classifier: Development Status :: 5 - Production/Stable
@@ -32,4 +30,6 @@
Classifier: Topic :: Text Processing
Classifier: Topic :: Utilities
Requires-Python: >=3.5
+Description-Content-Type: text/x-rst
Provides-Extra: test
+Provides-Extra: lint
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sphinxcontrib-htmlhelp-1.0.2/sphinxcontrib_htmlhelp.egg-info/SOURCES.txt
new/sphinxcontrib-htmlhelp-1.0.3/sphinxcontrib_htmlhelp.egg-info/SOURCES.txt
---
old/sphinxcontrib-htmlhelp-1.0.2/sphinxcontrib_htmlhelp.egg-info/SOURCES.txt
2019-04-11 18:02:34.000000000 +0200
+++
new/sphinxcontrib-htmlhelp-1.0.3/sphinxcontrib_htmlhelp.egg-info/SOURCES.txt
2020-02-21 18:09:56.000000000 +0100
@@ -124,8 +124,6 @@
sphinxcontrib_htmlhelp.egg-info/top_level.txt
tests/conftest.py
tests/test_htmlhelp.py
-tests/__pycache__/conftest.cpython-37-PYTEST.pyc
-tests/__pycache__/test_htmlhelp.cpython-37-PYTEST.pyc
tests/roots/test-basic/conf.py
tests/roots/test-basic/index.rst
tests/roots/test-chm/conf.py
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sphinxcontrib-htmlhelp-1.0.2/sphinxcontrib_htmlhelp.egg-info/requires.txt
new/sphinxcontrib-htmlhelp-1.0.3/sphinxcontrib_htmlhelp.egg-info/requires.txt
---
old/sphinxcontrib-htmlhelp-1.0.2/sphinxcontrib_htmlhelp.egg-info/requires.txt
2019-04-11 18:02:34.000000000 +0200
+++
new/sphinxcontrib-htmlhelp-1.0.3/sphinxcontrib_htmlhelp.egg-info/requires.txt
2020-02-21 18:09:56.000000000 +0100
@@ -1,6 +1,9 @@
-[test]
-pytest
+[lint]
flake8
mypy
+docutils-stubs
+
+[test]
+pytest
html5lib
Binary files
old/sphinxcontrib-htmlhelp-1.0.2/tests/__pycache__/conftest.cpython-37-PYTEST.pyc
and
new/sphinxcontrib-htmlhelp-1.0.3/tests/__pycache__/conftest.cpython-37-PYTEST.pyc
differ
Binary files
old/sphinxcontrib-htmlhelp-1.0.2/tests/__pycache__/test_htmlhelp.cpython-37-PYTEST.pyc
and
new/sphinxcontrib-htmlhelp-1.0.3/tests/__pycache__/test_htmlhelp.cpython-37-PYTEST.pyc
differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sphinxcontrib-htmlhelp-1.0.2/tox.ini
new/sphinxcontrib-htmlhelp-1.0.3/tox.ini
--- old/sphinxcontrib-htmlhelp-1.0.2/tox.ini 2019-04-07 11:52:42.000000000
+0200
+++ new/sphinxcontrib-htmlhelp-1.0.3/tox.ini 2020-02-21 17:56:16.000000000
+0100
@@ -1,5 +1,5 @@
[tox]
-envlist=flake8,mypy,py35,py36,py37,py38
+envlist=flake8,mypy,py35,py36,py37,py38,py39
[testenv]
deps=
@@ -12,17 +12,25 @@
commands=
pytest --durations 25 {posargs}
+[testenv:py39]
+deps =
+ {[testenv]deps}
+ git+https://github.com/html5lib/html5lib-python
+
[testenv:flake8]
description =
Run style checks.
+extras =
+ test
+ lint
commands=
flake8
[testenv:mypy]
description =
Run type checks.
-deps =
- mypy
- docutils-stubs
+extras =
+ test
+ lint
commands=
mypy sphinxcontrib/
