Merge branch 'master' into fix-urls

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/action@v2.0.0
 
   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.1.0
-  commit: 13cdeb95abccc78a5ce17acf9f6e8cf5b9ce713b
-  date: Jul 1, 2021
+  commit: e5986bb7cca20ac95dc81e4741c08949bf01bb77
+  date: Jul 15, 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/code.py

@@ -29,7 +29,7 @@ def code(state: StateBlock, startLine: int, endLine: int, silent: bool = False):
     state.line = last
 
     token = state.push("code_block", "code", 0)
-    token.content = state.getLines(startLine, last, 4 + state.blkIndent, True)
+    token.content = state.getLines(startLine, last, 4 + state.blkIndent, False) + "\n"
     token.map = [startLine, state.line]
 
     return True

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
@@ -62,11 +63,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 =

tests/test_port/fixtures/normalize.md

@@ -29,3 +29,11 @@ Don't encode domains in unknown schemas:
 .
 <p><a href="skype:%CE%B3%CE%B3%CE%B3"></a></p>
 .
+
+
+Square brackets are allowed
+.
+[foo](https://bar]baz.org)
+.
+<p><a href="https://bar%5Dbaz.org">foo</a></p>
+.

tests/test_port/test_fixtures.py

@@ -77,6 +77,12 @@ def test_commonmark_extras(line, title, input, expected):
     read_fixture_file(FIXTURE_PATH.joinpath("normalize.md")),
 )
 def test_normalize_url(line, title, input, expected):
+    if title in {
+        "Keep %25 as is because decoding it may break urls, #720",
+        "Square brackets are allowed",
+    }:
+        # TODO fix failing url escaping test
+        pytest.xfail("url normalisation")
     md = MarkdownIt("commonmark")
     text = md.render(input)
     assert text.rstrip() == expected.rstrip()

tests/test_port/test_no_end_newline.py

@@ -17,6 +17,7 @@
         ("<h1></h1>", "<h1></h1>"),
         ("p", "<p>p</p>\n"),
         ("[reference]: /url", ""),
+        ("    indented code block", "<pre><code>indented code block\n</code></pre>\n"),
     ],
 )
 def test_no_end_newline(input, expected):

tox.ini

@@ -9,13 +9,13 @@ envlist = py37
 [testenv]
 usedevelop = true
 
-[testenv:py{36,37,38,39}]
+[testenv:py{36,37,38,39,310}]
 extras =
     linkify
     testing
-commands = pytest {posargs}
+commands = pytest tests/ {posargs}
 
-[testenv:py{36,37,38,39}-plugins]
+[testenv:py{36,37,38,39,310}-plugins]
 extras = testing
 changedir = {envtmpdir}
 allowlist_externals =
@@ -28,11 +28,11 @@ commands =
     pytest {posargs}
 
 [testenv:py{36,37,38,39}-bench-core]
-extras = testing
+extras = benchmarking
 commands = pytest benchmarking/bench_core.py {posargs}
 
 [testenv:py{36,37,38}-bench-packages]
-extras = testing,compare
+extras = benchmarking,compare
 commands = pytest benchmarking/bench_packages.py {posargs}
 
 [testenv:docs-{update,clean}]