Merge branch 'master' into add-url-xfail

Author: chrisjsewell

.github/workflows/tests.yml

@@ -23,15 +23,15 @@ jobs:
     - name: Set up Python 3.8
       uses: actions/setup-python@v2
       with:
-        python-version: 3.8
+        python-version: '3.8'
     - uses: pre-commit/[email protected]
 
   tests:
 
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [pypy-3.6, 3.6, 3.7, 3.8, 3.9]
+        python-version: ['pypy-3.6', '3.6', '3.7', '3.8', '3.9', '3.10']
 
     steps:
     - uses: actions/checkout@v2
@@ -45,9 +45,9 @@ jobs:
         pip install .[testing,linkify]
     - name: Run pytest
       run: |
-        pytest --cov=markdown_it --cov-report=xml --cov-report=term-missing
+        pytest tests/ --cov=markdown_it --cov-report=xml --cov-report=term-missing
     - name: Upload to Codecov
-      if: matrix.python-version == 3.7 && github.repository == 'executablebooks/markdown-it-py'
+      if: matrix.python-version == '3.7' && github.repository == 'executablebooks/markdown-it-py'
       uses: codecov/codecov-action@v1
       with:
         name: markdown-it-py-pytests-py3.7
@@ -60,7 +60,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.8]
+        python-version: ['3.8']
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
@@ -87,7 +87,7 @@ jobs:
     - name: Set up Python 3.8
       uses: actions/setup-python@v2
       with:
-        python-version: 3.8
+        python-version: '3.8'
 
     - name: Install tox
       run: |
@@ -116,7 +116,7 @@ jobs:
     - name: Set up Python 3.7
       uses: actions/setup-python@v2
       with:
-        python-version: 3.7
+        python-version: '3.7'
     - name: Build package
       run: |
         pip install wheel

markdown_it/port.yaml

@@ -1,7 +1,7 @@
 - package: markdown-it/markdown-it
-  version: 12.0.6
-  commit: df4607f1d4d4be7fdc32e71c04109aea8cc373fa
-  date: Apr 16, 2021
+  version: 12.1.0
+  commit: 13cdeb95abccc78a5ce17acf9f6e8cf5b9ce713b
+  date: Jul 1, 2021
   notes:
     - Rename variables that use python built-in names, e.g.
       - `max` -> `maximum`

markdown_it/ruler.py

@@ -103,7 +103,7 @@ def __compile__(self) -> None:
     def at(self, ruleName: str, fn: RuleFunc, options=None):
         """Replace rule by name with new function & options.
 
-        :param name: rule name to replace.
+        :param ruleName: rule name to replace.
         :param fn: new rule function.
         :param options: new rule options (not mandatory).
         :raises: KeyError if name not found
@@ -135,8 +135,8 @@ def before(self, beforeName: str, ruleName: str, fn: RuleFunc, options=None):
     def after(self, afterName: str, ruleName: str, fn: RuleFunc, options=None):
         """Add new rule to chain after one with given name.
 
-        :param beforeName: new rule will be added before this one.
-        :param ruleName: new rule will be added before this one.
+        :param afterName: new rule will be added after this one.
+        :param ruleName: new rule will be added after this one.
         :param fn: new rule function.
         :param options: new rule options (not mandatory).
         :raises: KeyError if name not found
@@ -153,7 +153,7 @@ def after(self, afterName: str, ruleName: str, fn: RuleFunc, options=None):
     def push(self, ruleName: str, fn: RuleFunc, options=None):
         """Push new rule to the end of chain.
 
-        :param ruleName: new rule will be added before this one.
+        :param ruleName: new rule will be added to the end of chain.
         :param fn: new rule function.
         :param options: new rule options (not mandatory).
 

markdown_it/rules_block/html_block.py

@@ -13,8 +13,8 @@
 # last argument defines whether it can terminate a paragraph or not
 HTML_SEQUENCES: List[Tuple[Pattern, Pattern, bool]] = [
     (
-        re.compile(r"^<(script|pre|style)(?=(\s|>|$))", re.IGNORECASE),
-        re.compile(r"<\/(script|pre|style)>", re.IGNORECASE),
+        re.compile(r"^<(script|pre|style|textarea)(?=(\s|>|$))", re.IGNORECASE),
+        re.compile(r"<\/(script|pre|style|textarea)>", re.IGNORECASE),
         True,
     ),
     (re.compile(r"^<!--"), re.compile(r"-->"), True),

markdown_it/rules_inline/balance_pairs.py

@@ -23,11 +23,15 @@ def processDelimiters(state: StateInline, delimiters, *args):
             continue
 
         # Previously calculated lower bounds (previous fails)
-        # for each marker and each delimiter length modulo 3.
+        # for each marker, each delimiter length modulo 3,
+        # and for whether this closer can be an opener;
+        # https://github.com/commonmark/cmark/commit/34250e12ccebdc6372b8b49c44fab57c72443460
         if closer.marker not in openersBottom:
-            openersBottom[closer.marker] = [-1, -1, -1]
+            openersBottom[closer.marker] = [-1, -1, -1, -1, -1, -1]
 
-        minOpenerIdx = openersBottom[closer.marker][closer.length % 3]
+        minOpenerIdx = openersBottom[closer.marker][
+            (3 if closer.open else 0) + (closer.length % 3)
+        ]
 
         openerIdx = closerIdx - closer.jump - 1
 
@@ -89,7 +93,9 @@ def processDelimiters(state: StateInline, delimiters, *args):
             # See details here:
             # https:#github.com/commonmark/cmark/issues/178#issuecomment-270417442
             #
-            openersBottom[closer.marker][(closer.length or 0) % 3] = newMinOpenerIdx
+            openersBottom[closer.marker][
+                (3 if closer.open else 0) + ((closer.length or 0) % 3)
+            ] = newMinOpenerIdx
 
         closerIdx += 1
 

setup.cfg

@@ -18,6 +18,7 @@ classifiers =
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
     Programming Language :: Python :: Implementation :: CPython
     Programming Language :: Python :: Implementation :: PyPy
     Topic :: Software Development :: Libraries :: Python Modules
@@ -61,11 +62,13 @@ rtd =
     sphinx_book_theme
 testing =
     coverage
-    psutil
-    pytest>=3.6,<4
-    pytest-benchmark~=3.2
+    pytest
     pytest-cov
     pytest-regressions
+benchmarking =
+    psutil
+    pytest
+    pytest-benchmark~=3.2
 
 [options.packages.find]
 exclude =