Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-readme_renderer for
openSUSE:Factory checked in at 2022-01-20 00:11:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-readme_renderer (Old)
and /work/SRC/openSUSE:Factory/.python-readme_renderer.new.1892 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-readme_renderer"
Thu Jan 20 00:11:48 2022 rev:6 rq:946779 version:32.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-readme_renderer/python-readme_renderer.changes
2021-03-29 18:21:10.550225282 +0200
+++
/work/SRC/openSUSE:Factory/.python-readme_renderer.new.1892/python-readme_renderer.changes
2022-01-20 00:11:55.542559355 +0100
@@ -1,0 +2,10 @@
+Sun Jan 16 12:48:21 UTC 2022 - Dirk M??ller <dmuel...@suse.com>
+
+- update to 32.0:
+ * Allow start attribute in ordered lists (#216)
+ * No limit rendering RST one column field names (#219)
+ * Render disabled checkboxes from Markdown (#217)
+ * support cmarkgfm>=0.6.0 (#209)
+- drop remove-mock.patch, remove-six.patch: upstream
+
+-------------------------------------------------------------------
Old:
----
readme_renderer-29.0.tar.gz
remove-mock.patch
remove-six.patch
New:
----
readme_renderer-32.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-readme_renderer.spec ++++++
--- /var/tmp/diff_new_pack.0ha6is/_old 2022-01-20 00:11:56.362560017 +0100
+++ /var/tmp/diff_new_pack.0ha6is/_new 2022-01-20 00:11:56.366560020 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-readme_renderer
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,16 +19,12 @@
%define skip_python2 1
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-readme_renderer
-Version: 29.0
+Version: 32.0
Release: 0
Summary: A library for rendering "readme" descriptions
License: Apache-2.0
URL: https://github.com/pypa/readme_renderer
Source:
https://files.pythonhosted.org/packages/source/r/readme_renderer/readme_renderer-%{version}.tar.gz
-# PATCH-FIX-UPSTREAM remove-mock.patch -- part of gh#pypa/readme_renderer#192
-Patch0:
https://github.com/pypa/readme_renderer/commit/091bcd6.patch#/remove-mock.patch
-# PATCH-FIX-UPSTREAM remove-six.patch -- part of gh#pypa/readme_renderer#192
-Patch1:
https://github.com/pypa/readme_renderer/commit/690e524.patch#/remove-six.patch
BuildRequires: %{python_module Pygments >= 2.5.1}
BuildRequires: %{python_module bleach >= 2.1.0}
BuildRequires: %{python_module cmarkgfm >= 0.5.0}
++++++ readme_renderer-29.0.tar.gz -> readme_renderer-32.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/readme_renderer-29.0/CHANGES.rst
new/readme_renderer-32.0/CHANGES.rst
--- old/readme_renderer-29.0/CHANGES.rst 2021-02-23 06:44:56.000000000
+0100
+++ new/readme_renderer-32.0/CHANGES.rst 2021-12-13 17:24:51.000000000
+0100
@@ -1,6 +1,22 @@
Changes
=======
+32.0 (2021-12-13)
+-----------------
+
+* Allow start attribute in ordered lists (#216)
+* No limit rendering RST one column field names (#219)
+
+31.0 (2021-12-09)
+-----------------
+
+* Render disabled checkboxes from Markdown (#217)
+
+30.0 (2021-09-30)
+-----------------
+
+* support cmarkgfm>=0.6.0 (#209)
+
29.0 (2021-02-22)
-----------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/readme_renderer-29.0/PKG-INFO
new/readme_renderer-32.0/PKG-INFO
--- old/readme_renderer-29.0/PKG-INFO 2021-02-23 06:45:06.657447800 +0100
+++ new/readme_renderer-32.0/PKG-INFO 2021-12-13 17:25:01.055701700 +0100
@@ -1,48 +1,11 @@
Metadata-Version: 2.1
Name: readme_renderer
-Version: 29.0
+Version: 32.0
Summary: readme_renderer is a library for rendering "readme" descriptions for
Warehouse
Home-page: https://github.com/pypa/readme_renderer
Author: The Python Packaging Authority
Author-email: ad...@mail.pypi.org
License: Apache License, Version 2.0
-Description: Readme Renderer
- ===============
-
- Readme Renderer is a library that will safely render arbitrary
- ``README`` files into HTML. It is designed to be used in Warehouse_ to
- render the ``long_description`` for packages. It can handle Markdown,
- reStructuredText (``.rst``), and plain text.
-
- .. _Warehouse: https://github.com/pypa/warehouse
-
-
- Check Description Locally
- -------------------------
-
- To locally check whether your long descriptions will render on PyPI,
first
- build your distributions, and then use the |twine check|_ command.
-
-
- Render rST Description Locally
- ------------------------------
-
- You can use ``readme_renderer`` on the command line to render an rST
file as
- HTML like this: ::
-
- python -m readme_renderer README.rst -o /tmp/README.html
-
- Code of Conduct
- ---------------
-
- Everyone interacting in the readme_renderer project's codebases, issue
trackers,
- chat rooms, and mailing lists is expected to follow the `PSF Code of
Conduct`_.
-
-
- .. |twine check| replace:: ``twine check``
- .. _twine check:
https://packaging.python.org/guides/making-a-pypi-friendly-readme#validating-restructuredtext-markup
- .. _PSF Code of Conduct:
https://github.com/pypa/.github/blob/main/CODE_OF_CONDUCT.md
-
Platform: UNKNOWN
Classifier: Intended Audience :: Developers
Classifier: License :: OSI Approved :: Apache Software License
@@ -61,4 +24,45 @@
Classifier: Programming Language :: Python :: 3.9
Classifier: Programming Language :: Python :: Implementation :: CPython
Classifier: Programming Language :: Python :: Implementation :: PyPy
+Requires-Python: >=3.6
Provides-Extra: md
+License-File: LICENSE
+
+Readme Renderer
+===============
+
+Readme Renderer is a library that will safely render arbitrary
+``README`` files into HTML. It is designed to be used in Warehouse_ to
+render the ``long_description`` for packages. It can handle Markdown,
+reStructuredText (``.rst``), and plain text.
+
+.. _Warehouse: https://github.com/pypa/warehouse
+
+
+Check Description Locally
+-------------------------
+
+To locally check whether your long descriptions will render on PyPI, first
+build your distributions, and then use the |twine check|_ command.
+
+
+Render rST Description Locally
+------------------------------
+
+You can use ``readme_renderer`` on the command line to render an rST file as
+HTML like this: ::
+
+ python -m readme_renderer README.rst -o /tmp/README.html
+
+Code of Conduct
+---------------
+
+Everyone interacting in the readme_renderer project's codebases, issue
trackers,
+chat rooms, and mailing lists is expected to follow the `PSF Code of Conduct`_.
+
+
+.. |twine check| replace:: ``twine check``
+.. _twine check:
https://packaging.python.org/guides/making-a-pypi-friendly-readme#validating-restructuredtext-markup
+.. _PSF Code of Conduct:
https://github.com/pypa/.github/blob/main/CODE_OF_CONDUCT.md
+
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/readme_renderer-29.0/readme_renderer/__about__.py
new/readme_renderer-32.0/readme_renderer/__about__.py
--- old/readme_renderer-29.0/readme_renderer/__about__.py 2021-02-23
06:44:56.000000000 +0100
+++ new/readme_renderer-32.0/readme_renderer/__about__.py 2021-12-13
17:24:51.000000000 +0100
@@ -14,16 +14,23 @@
from __future__ import absolute_import, division, print_function
__all__ = [
- "__title__", "__summary__", "__uri__", "__version__", "__author__",
- "__email__", "__license__", "__copyright__",
+ "__title__",
+ "__summary__",
+ "__uri__",
+ "__version__",
+ "__author__",
+ "__email__",
+ "__license__",
+ "__copyright__",
]
__title__ = "readme_renderer"
-__summary__ = ('readme_renderer is a library for rendering "readme" '
- 'descriptions for Warehouse')
+__summary__ = (
+ 'readme_renderer is a library for rendering "readme" ' "descriptions for
Warehouse"
+)
__uri__ = "https://github.com/pypa/readme_renderer";
-__version__ = "29.0"
+__version__ = "32.0"
__author__ = "The Python Packaging Authority"
__email__ = "ad...@mail.pypi.org"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/readme_renderer-29.0/readme_renderer/clean.py
new/readme_renderer-32.0/readme_renderer/clean.py
--- old/readme_renderer-29.0/readme_renderer/clean.py 2021-02-23
06:44:56.000000000 +0100
+++ new/readme_renderer-32.0/readme_renderer/clean.py 2021-12-13
17:24:51.000000000 +0100
@@ -30,7 +30,7 @@
"br", "caption", "cite", "col", "colgroup", "dd", "del", "details", "div",
"dl", "dt", "h1", "h2", "h3", "h4", "h5", "h6", "hr", "img", "p", "pre",
"span", "sub", "summary", "sup", "table", "tbody", "td", "th", "thead",
- "tr", "tt", "kbd", "var",
+ "tr", "tt", "kbd", "var", "input",
]
ALLOWED_ATTRIBUTES = {
@@ -46,6 +46,7 @@
"span": ["class"],
"th": ["align"],
"td": ["align"],
+ "div": ["align"],
"h1": ["align"],
"h2": ["align"],
"h3": ["align"],
@@ -54,12 +55,40 @@
"h6": ["align"],
"code": ["class"],
"p": ["align"],
+ "ol": ["start"],
+ "input": ["type", "checked", "disabled"],
}
ALLOWED_STYLES = [
]
+class DisabledCheckboxInputsFilter:
+ def __init__(self, source):
+ self.source = source
+
+ def __iter__(self):
+ for token in self.source:
+ if token.get("name") == "input":
+ # only allow disabled checkbox inputs
+ is_checkbox, is_disabled, unsafe_attrs = False, False, False
+ for (_, attrname), value in token.get("data", {}).items():
+ if attrname == "type" and value == "checkbox":
+ is_checkbox = True
+ elif attrname == "disabled":
+ is_disabled = True
+ elif attrname != "checked":
+ unsafe_attrs = True
+ break
+ if is_checkbox and is_disabled and not unsafe_attrs:
+ yield token
+ else:
+ yield token
+
+ def __getattr__(self, name):
+ return getattr(self.source, name)
+
+
def clean(html, tags=None, attributes=None, styles=None):
if tags is None:
tags = ALLOWED_TAGS
@@ -85,6 +114,7 @@
skip_tags=["pre"],
parse_email=False,
),
+ DisabledCheckboxInputsFilter,
],
)
try:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/readme_renderer-29.0/readme_renderer/integration/distutils.py
new/readme_renderer-32.0/readme_renderer/integration/distutils.py
--- old/readme_renderer-29.0/readme_renderer/integration/distutils.py
2021-02-23 06:44:56.000000000 +0100
+++ new/readme_renderer-32.0/readme_renderer/integration/distutils.py
2021-12-13 17:24:51.000000000 +0100
@@ -20,7 +20,6 @@
import distutils.log
from distutils.command.check import check as _check
from distutils.core import Command
-import six
from ..rst import render
@@ -35,7 +34,6 @@
r'(?P<message>.*)', re.DOTALL | re.MULTILINE)
-@six.python_2_unicode_compatible
class _WarningStream(object):
def __init__(self):
self.output = io.StringIO()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/readme_renderer-29.0/readme_renderer/markdown.py
new/readme_renderer-32.0/readme_renderer/markdown.py
--- old/readme_renderer-29.0/readme_renderer/markdown.py 2021-02-23
06:44:56.000000000 +0100
+++ new/readme_renderer-32.0/readme_renderer/markdown.py 2021-12-13
17:24:51.000000000 +0100
@@ -16,17 +16,12 @@
import re
import warnings
+from html.parser import unescape
+
import pygments
import pygments.lexers
import pygments.formatters
-try:
- from six.moves.html_parser import unescape
-except ImportError: # Python 2
- from six.moves import html_parser
-
- unescape = html_parser.HTMLParser().unescape
-
from .clean import clean
_EXTRA_WARNING = (
@@ -93,7 +88,10 @@
formatter = pygments.formatters.HtmlFormatter(nowrap=True)
code_expr = re.compile(
- r'<pre><code class="language-(?P<lang>.+?)">(?P<code>.+?)'
+ # cmarkgfm<0.6.0: <pre><code
class="language-python">print('hello')</code></pre>
+ # cmarkgfm>=0.6.0: <pre lang="python"><code>print('hello')</code></pre>
+ r'(<pre>(?P<in_code><code) class="language-|<pre
lang=")(?P<lang>[^"]+?)">'
+ '(?(in_code)|<code>)(?P<code>.+?)'
r'</code></pre>', re.DOTALL)
def replacer(match):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/readme_renderer-29.0/readme_renderer/rst.py
new/readme_renderer-32.0/readme_renderer/rst.py
--- old/readme_renderer-29.0/readme_renderer/rst.py 2021-02-23
06:44:56.000000000 +0100
+++ new/readme_renderer-32.0/readme_renderer/rst.py 2021-12-13
17:24:51.000000000 +0100
@@ -88,6 +88,10 @@
# Use the short form of syntax highlighting so that the generated
# Pygments CSS can be used to style the output.
"syntax_highlight": "short",
+
+ # Maximum width (in characters) for one-column field names.
+ # 0 means "no limit"
+ "field_name_limit": 0,
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/readme_renderer-29.0/readme_renderer.egg-info/PKG-INFO
new/readme_renderer-32.0/readme_renderer.egg-info/PKG-INFO
--- old/readme_renderer-29.0/readme_renderer.egg-info/PKG-INFO 2021-02-23
06:45:06.000000000 +0100
+++ new/readme_renderer-32.0/readme_renderer.egg-info/PKG-INFO 2021-12-13
17:25:01.000000000 +0100
@@ -1,48 +1,11 @@
Metadata-Version: 2.1
Name: readme-renderer
-Version: 29.0
+Version: 32.0
Summary: readme_renderer is a library for rendering "readme" descriptions for
Warehouse
Home-page: https://github.com/pypa/readme_renderer
Author: The Python Packaging Authority
Author-email: ad...@mail.pypi.org
License: Apache License, Version 2.0
-Description: Readme Renderer
- ===============
-
- Readme Renderer is a library that will safely render arbitrary
- ``README`` files into HTML. It is designed to be used in Warehouse_ to
- render the ``long_description`` for packages. It can handle Markdown,
- reStructuredText (``.rst``), and plain text.
-
- .. _Warehouse: https://github.com/pypa/warehouse
-
-
- Check Description Locally
- -------------------------
-
- To locally check whether your long descriptions will render on PyPI,
first
- build your distributions, and then use the |twine check|_ command.
-
-
- Render rST Description Locally
- ------------------------------
-
- You can use ``readme_renderer`` on the command line to render an rST
file as
- HTML like this: ::
-
- python -m readme_renderer README.rst -o /tmp/README.html
-
- Code of Conduct
- ---------------
-
- Everyone interacting in the readme_renderer project's codebases, issue
trackers,
- chat rooms, and mailing lists is expected to follow the `PSF Code of
Conduct`_.
-
-
- .. |twine check| replace:: ``twine check``
- .. _twine check:
https://packaging.python.org/guides/making-a-pypi-friendly-readme#validating-restructuredtext-markup
- .. _PSF Code of Conduct:
https://github.com/pypa/.github/blob/main/CODE_OF_CONDUCT.md
-
Platform: UNKNOWN
Classifier: Intended Audience :: Developers
Classifier: License :: OSI Approved :: Apache Software License
@@ -61,4 +24,45 @@
Classifier: Programming Language :: Python :: 3.9
Classifier: Programming Language :: Python :: Implementation :: CPython
Classifier: Programming Language :: Python :: Implementation :: PyPy
+Requires-Python: >=3.6
Provides-Extra: md
+License-File: LICENSE
+
+Readme Renderer
+===============
+
+Readme Renderer is a library that will safely render arbitrary
+``README`` files into HTML. It is designed to be used in Warehouse_ to
+render the ``long_description`` for packages. It can handle Markdown,
+reStructuredText (``.rst``), and plain text.
+
+.. _Warehouse: https://github.com/pypa/warehouse
+
+
+Check Description Locally
+-------------------------
+
+To locally check whether your long descriptions will render on PyPI, first
+build your distributions, and then use the |twine check|_ command.
+
+
+Render rST Description Locally
+------------------------------
+
+You can use ``readme_renderer`` on the command line to render an rST file as
+HTML like this: ::
+
+ python -m readme_renderer README.rst -o /tmp/README.html
+
+Code of Conduct
+---------------
+
+Everyone interacting in the readme_renderer project's codebases, issue
trackers,
+chat rooms, and mailing lists is expected to follow the `PSF Code of Conduct`_.
+
+
+.. |twine check| replace:: ``twine check``
+.. _twine check:
https://packaging.python.org/guides/making-a-pypi-friendly-readme#validating-restructuredtext-markup
+.. _PSF Code of Conduct:
https://github.com/pypa/.github/blob/main/CODE_OF_CONDUCT.md
+
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/readme_renderer-29.0/readme_renderer.egg-info/SOURCES.txt
new/readme_renderer-32.0/readme_renderer.egg-info/SOURCES.txt
--- old/readme_renderer-29.0/readme_renderer.egg-info/SOURCES.txt
2021-02-23 06:45:06.000000000 +0100
+++ new/readme_renderer-32.0/readme_renderer.egg-info/SOURCES.txt
2021-12-13 17:25:01.000000000 +0100
@@ -97,6 +97,10 @@
tests/fixtures/test_GFM_022.md
tests/fixtures/test_GFM_023.html
tests/fixtures/test_GFM_023.md
+tests/fixtures/test_GFM_024.html
+tests/fixtures/test_GFM_024.md
+tests/fixtures/test_GFM_025.html
+tests/fixtures/test_GFM_025.md
tests/fixtures/test_GFM_doublequotes.html
tests/fixtures/test_GFM_doublequotes.md
tests/fixtures/test_GFM_highlight.html
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/readme_renderer-29.0/readme_renderer.egg-info/requires.txt
new/readme_renderer-32.0/readme_renderer.egg-info/requires.txt
--- old/readme_renderer-29.0/readme_renderer.egg-info/requires.txt
2021-02-23 06:45:06.000000000 +0100
+++ new/readme_renderer-32.0/readme_renderer.egg-info/requires.txt
2021-12-13 17:25:01.000000000 +0100
@@ -1,7 +1,6 @@
bleach>=2.1.0
docutils>=0.13.1
Pygments>=2.5.1
-six
[md]
-cmarkgfm<0.6.0,>=0.5.0
+cmarkgfm<0.7.0,>=0.5.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/readme_renderer-29.0/setup.cfg
new/readme_renderer-32.0/setup.cfg
--- old/readme_renderer-29.0/setup.cfg 2021-02-23 06:45:06.657447800 +0100
+++ new/readme_renderer-32.0/setup.cfg 2021-12-13 17:25:01.055701700 +0100
@@ -1,6 +1,3 @@
-[bdist_wheel]
-universal = 1
-
[metadata]
license_file = LICENSE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/readme_renderer-29.0/setup.py
new/readme_renderer-32.0/setup.py
--- old/readme_renderer-29.0/setup.py 2021-02-23 06:44:56.000000000 +0100
+++ new/readme_renderer-32.0/setup.py 2021-12-13 17:24:51.000000000 +0100
@@ -55,10 +55,11 @@
"Programming Language :: Python :: Implementation :: CPython",
"Programming Language :: Python :: Implementation :: PyPy",
],
- install_requires=["bleach>=2.1.0", "docutils>=0.13.1", "Pygments>=2.5.1",
"six"],
+ install_requires=["bleach>=2.1.0", "docutils>=0.13.1", "Pygments>=2.5.1"],
entry_points={
"distutils.commands": ["check =
readme_renderer.integration.distutils:Check"],
},
- extras_require={"md": "cmarkgfm>=0.5.0,<0.6.0"},
+ extras_require={"md": "cmarkgfm>=0.5.0,<0.7.0"},
packages=setuptools.find_packages(exclude=["tests", "tests.*"]),
+ python_requires=">=3.6",
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/readme_renderer-29.0/tests/fixtures/test_GFM_024.html
new/readme_renderer-32.0/tests/fixtures/test_GFM_024.html
--- old/readme_renderer-29.0/tests/fixtures/test_GFM_024.html 1970-01-01
01:00:00.000000000 +0100
+++ new/readme_renderer-32.0/tests/fixtures/test_GFM_024.html 2021-12-13
17:24:51.000000000 +0100
@@ -0,0 +1,17 @@
+<ul>
+<li><input disabled type="checkbox"> Valid unchecked checkbox</li>
+<li><input checked disabled type="checkbox"> Valid checked checkbox</li>
+<li> Invalid enabled checkbox</li>
+<li>
+
+</li>
+<li>
+
+</li>
+<li>
+
+</li>
+<li>
+
+</li>
+</ul>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/readme_renderer-29.0/tests/fixtures/test_GFM_024.md
new/readme_renderer-32.0/tests/fixtures/test_GFM_024.md
--- old/readme_renderer-29.0/tests/fixtures/test_GFM_024.md 1970-01-01
01:00:00.000000000 +0100
+++ new/readme_renderer-32.0/tests/fixtures/test_GFM_024.md 2021-12-13
17:24:51.000000000 +0100
@@ -0,0 +1,7 @@
+- [ ] Valid unchecked checkbox
+- [x] Valid checked checkbox
+- <input type="checkbox"> Invalid enabled checkbox
+- <input onlick="alert('XSS')" />
+- <input type="submit" />
+- <input method="PUT" />
+- <input type="checkbox" checked />
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/readme_renderer-29.0/tests/fixtures/test_GFM_025.html
new/readme_renderer-32.0/tests/fixtures/test_GFM_025.html
--- old/readme_renderer-29.0/tests/fixtures/test_GFM_025.html 1970-01-01
01:00:00.000000000 +0100
+++ new/readme_renderer-32.0/tests/fixtures/test_GFM_025.html 2021-12-13
17:24:51.000000000 +0100
@@ -0,0 +1,12 @@
+<ol start="3">
+<li>Foo</li>
+</ol>
+<p>Some text</p>
+<ol start="2">
+<li>
+<p>Bar</p>
+</li>
+<li>
+<p>Baz</p>
+</li>
+</ol>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/readme_renderer-29.0/tests/fixtures/test_GFM_025.md
new/readme_renderer-32.0/tests/fixtures/test_GFM_025.md
--- old/readme_renderer-29.0/tests/fixtures/test_GFM_025.md 1970-01-01
01:00:00.000000000 +0100
+++ new/readme_renderer-32.0/tests/fixtures/test_GFM_025.md 2021-12-13
17:24:51.000000000 +0100
@@ -0,0 +1,7 @@
+3. Foo
+
+Some text
+
+2. Bar
+
+1. Baz
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/readme_renderer-29.0/tests/test_integration_distutils.py
new/readme_renderer-32.0/tests/test_integration_distutils.py
--- old/readme_renderer-29.0/tests/test_integration_distutils.py
2021-02-23 06:44:56.000000000 +0100
+++ new/readme_renderer-32.0/tests/test_integration_distutils.py
2021-12-13 17:24:51.000000000 +0100
@@ -1,6 +1,6 @@
import distutils.dist
+import unittest.mock
-import mock
import pytest
import setuptools.dist
@@ -11,7 +11,7 @@
dist = distutils.dist.Distribution(attrs=dict(
long_description="Hello, I am some text."))
checker = readme_renderer.integration.distutils.Check(dist)
- checker.warn = mock.Mock()
+ checker.warn = unittest.mock.Mock()
checker.check_restructuredtext()
@@ -22,14 +22,14 @@
dist = distutils.dist.Distribution(attrs=dict(
long_description="Hello, I am some `totally borked< text."))
checker = readme_renderer.integration.distutils.Check(dist)
- checker.warn = mock.Mock()
- checker.announce = mock.Mock()
+ checker.warn = unittest.mock.Mock()
+ checker.announce = unittest.mock.Mock()
checker.check_restructuredtext()
# Should warn once for the syntax error, and finally to warn that the
# overall syntax is invalid
- checker.warn.assert_called_once_with(mock.ANY)
+ checker.warn.assert_called_once_with(unittest.mock.ANY)
message = checker.warn.call_args[0][0]
assert 'invalid markup' in message
assert 'line 1: Warning:' in message
@@ -47,14 +47,14 @@
dist = distutils.dist.Distribution(attrs=dict(
long_description=description))
checker = readme_renderer.integration.distutils.Check(dist)
- checker.warn = mock.Mock()
- checker.announce = mock.Mock()
+ checker.warn = unittest.mock.Mock()
+ checker.announce = unittest.mock.Mock()
checker.check_restructuredtext()
# Should warn once for the syntax error, and finally to warn that the
# overall syntax is invalid
- checker.warn.assert_called_once_with(mock.ANY)
+ checker.warn.assert_called_once_with(unittest.mock.ANY)
message = checker.warn.call_args[0][0]
assert 'directive disabled' in message
@@ -68,7 +68,7 @@
long_description="Hello, I am some text.",
long_description_content_type="text/markdown"))
checker = readme_renderer.integration.distutils.Check(dist)
- checker.warn = mock.Mock()
+ checker.warn = unittest.mock.Mock()
checker.check_restructuredtext()
@@ -79,11 +79,11 @@
def test_invalid_missing():
dist = distutils.dist.Distribution(attrs=dict())
checker = readme_renderer.integration.distutils.Check(dist)
- checker.warn = mock.Mock()
+ checker.warn = unittest.mock.Mock()
checker.check_restructuredtext()
- checker.warn.assert_called_once_with(mock.ANY)
+ checker.warn.assert_called_once_with(unittest.mock.ANY)
assert 'missing' in checker.warn.call_args[0][0]
@@ -91,9 +91,9 @@
dist = distutils.dist.Distribution(attrs=dict(
long_description=""))
checker = readme_renderer.integration.distutils.Check(dist)
- checker.warn = mock.Mock()
+ checker.warn = unittest.mock.Mock()
checker.check_restructuredtext()
- checker.warn.assert_called_once_with(mock.ANY)
+ checker.warn.assert_called_once_with(unittest.mock.ANY)
assert 'missing' in checker.warn.call_args[0][0]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/readme_renderer-29.0/tests/test_rst.py
new/readme_renderer-32.0/tests/test_rst.py
--- old/readme_renderer-29.0/tests/test_rst.py 2021-02-23 06:44:56.000000000
+0100
+++ new/readme_renderer-32.0/tests/test_rst.py 2021-12-13 17:24:51.000000000
+0100
@@ -3,7 +3,6 @@
import os.path
import pytest
-import six
from readme_renderer.rst import render
@@ -46,7 +45,7 @@
def test_rst_raw():
- warnings = six.StringIO()
+ warnings = io.StringIO()
assert render("""
.. raw:: html
<script>I am evil</script>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/readme_renderer-29.0/tox.ini
new/readme_renderer-32.0/tox.ini
--- old/readme_renderer-29.0/tox.ini 2021-02-23 06:44:56.000000000 +0100
+++ new/readme_renderer-32.0/tox.ini 2021-12-13 17:24:51.000000000 +0100
@@ -4,13 +4,12 @@
[testenv]
deps =
pytest
- mock
commands =
- py.test --strict {posargs}
+ pytest --strict {posargs}
extras = md
[testenv:pep8]
-basepython = python3.6
+basepython = python3
deps =
flake8
pep8-naming
@@ -27,7 +26,7 @@
python -m twine check dist/*
[testenv:noextra]
-basepython = python3.6
+basepython = python3
extras =
[flake8]
