Merge branch 'main' into di-patch-1

Author: di

CHANGES.rst

@@ -1,6 +1,11 @@
 Changes
 =======
 
+30.0 (2021-09-30)
+-----------------
+
+* support cmarkgfm>=0.6.0 (#209)
+
 29.0 (2021-02-22)
 -----------------
 

readme_renderer/__about__.py

@@ -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__ = "30.0"
 
 __author__ = "The Python Packaging Authority"
 __email__ = "admin@mail.pypi.org"

readme_renderer/markdown.py

@@ -88,7 +88,10 @@ def _highlight(html):
     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):

setup.py

@@ -59,6 +59,6 @@
     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.*"]),
 )

tox.ini

@@ -9,7 +9,7 @@ commands =
 extras = md
 
 [testenv:pep8]
-basepython = python3.6
+basepython = python3
 deps =
     flake8
     pep8-naming
@@ -26,7 +26,7 @@ commands =
     python -m twine check dist/*
 
 [testenv:noextra]
-basepython = python3.6
+basepython = python3
 extras =
 
 [flake8]