Merge remote-tracking branch 'upstream/master' into renderer-protocol

Author: hukkinj1

.github/workflows/benchmark.yml

@@ -46,45 +46,3 @@ jobs:
         commit-msg-append: "[ci skip]"
         one-chart-groups: packages,plugins
         fail-on-alert: false
-
-  benchmark-plugins:
-
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: Set up Python 3.8
-      uses: actions/setup-python@v2
-      with:
-        python-version: 3.8
-
-    - name: Install tox
-      run: |
-        python -m pip install --upgrade pip
-        pip install tox
-
-    - name: Run plugin benchmarks
-      run: tox -e py38-bench-plugins -- --benchmark-min-rounds 20 --benchmark-json bench-plugins.json
-
-    # - name: Upload plugin data
-    #   uses: actions/upload-artifact@v2
-    #   with:
-    #     name: bench-plugins
-    #     path: bench-plugins.json
-    #     if-no-files-found: error
-
-    - name: Store benchmark result
-      uses: chrisjsewell/github-action-benchmark@v2
-      with:
-        name: Parsing Benchmarks
-        output-file-path: bench-plugins.json
-        # Use personal access token instead of GITHUB_TOKEN due to https://github.community/t5/GitHub-Actions/Github-action-not-triggering-gh-pages-upon-push/td-p/26869/highlight/false
-        github-token: ${{ secrets.GITHUB_TOKEN }}
-        auto-push: true
-        commit-msg-append: "[ci skip]"
-        one-chart-groups: packages,plugins
-        # Show alert with commit comment on detecting possible performance regression
-        alert-threshold: '200%'
-        comment-on-alert: true
-        fail-on-alert: false
-        alert-comment-cc-users: '@chrisjsewell'

.github/workflows/tests.yml

@@ -9,6 +9,8 @@ on:
     tags:
       - 'v*'
   pull_request:
+  schedule:
+    - cron: '0 0 * * 0'  # every week
 
 jobs:
 
@@ -53,6 +55,29 @@ jobs:
         file: ./coverage.xml
         fail_ci_if_error: true
 
+  test-plugins:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: [3.8]
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install markdown-it-py
+      run: |
+        python -m pip install --upgrade pip
+        pip install .[testing]
+    - name: clone and install mdit-py-plugins
+      run: |
+        git clone https://github.com/executablebooks/mdit-py-plugins.git
+        pip install --no-deps -e mdit-py-plugins
+    - name: Run pytest for unit tests of mdit-py-plugins
+      run: cd mdit-py-plugins; pytest
+
   benchmark:
 
     runs-on: ubuntu-latest

.readthedocs.yml

@@ -7,6 +7,7 @@ python:
         path: .
         extra_requirements:
           - linkify
+          - plugins
           - rtd
 
 sphinx:

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change Log
 
+## 1.0.0b2 - 2021-04-25
+
+‼️ BREAKING: Move `mdit-py-plugins` out of the core install requirements and into a `plugins` extra.
+
+Synchronised code with the upstream Markdown-It `v12.0.6`:
+
+- 🐛 FIX: Raise HTML blocks priority to resolve conflict with headings
+- 🐛 FIX: Newline not rendered in image alt attribute
+
 ## 1.0.0b1 - 2021-03-31
 
 [Full commit log](https://github.com/executablebooks/markdown-it-py/compare/v0.6.2...9ecda04)
@@ -8,7 +17,7 @@ This is the first beta release of the stable v1.x series.
 
 There are four notable (and breaking) changes:
 
-1. The code has been synchronised with the upstream Markdown-It v12.0.4.
+1. The code has been synchronised with the upstream Markdown-It `v12.0.4`.
    In particular, this update alters the parsing of tables to be consistent with the GFM specification: <https://github.github.com/gfm/#tables-extension->
    A number of parsing performance and validation improvements are also included.
 2. `Token.attrs` are now stored as dictionaries, rather than a list of lists.

README.md

@@ -32,12 +32,20 @@ conda install -c conda-forge markdown-it-py
 or
 
 ```bash
-pip install markdown-it-py
+pip install markdown-it-py[plugins]
+```
+
+or with extras
+
+```bash
+conda install -c conda-forge markdown-it-py linkify-it-py mdit-py-plugins
+pip install markdown-it-py[linkify,plugins]
 ```
 
 ## Usage
 
 ### Python API Usage
+
 Render markdown to HTML with markdown-it-py and a custom configuration
 with and without plugins and features:
 
@@ -75,6 +83,7 @@ html_text = md.render(text)
 ```
 
 ### Command-line Usage
+
 Render markdown to HTML with markdown-it-py from the
 command-line:
 

benchmarking/bench_plugins.py

@@ -1,4 +1,4 @@
 from .main import MarkdownIt  # noqa: F401
 
 
-__version__ = "1.0.0b1"
+__version__ = "1.0.0b2"

markdown_it/__init__.py

@@ -24,9 +24,9 @@
     ("hr", rules_block.hr, ["paragraph", "reference", "blockquote", "list"]),
     ("list", rules_block.list_block, ["paragraph", "reference", "blockquote"]),
     ("reference", rules_block.reference),
+    ("html_block", rules_block.html_block, ["paragraph", "reference", "blockquote"]),
     ("heading", rules_block.heading, ["paragraph", "reference", "blockquote"]),
     ("lheading", rules_block.lheading),
-    ("html_block", rules_block.html_block, ["paragraph", "reference", "blockquote"]),
     ("paragraph", rules_block.paragraph),
 ]
 

markdown_it/extensions/__init__.py

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

markdown_it/extensions/amsmath.py

@@ -212,6 +212,8 @@ def renderInlineAsText(
             elif token.type == "image":
                 assert token.children is not None
                 result += self.renderInlineAsText(token.children, options, env)
+            elif token.type == "softbreak":
+                result += "\n"
 
         return result
 

markdown_it/extensions/anchors.py

@@ -30,7 +30,6 @@ project_urls =
 packages = find:
 install_requires =
     attrs>=19,<21
-    mdit-py-plugins~=0.2.6
     typing_extensions>=3.7.4;python_version<'3.8'
 python_requires = ~=3.6
 include_package_data = True
@@ -51,6 +50,8 @@ compare =
     panflute~=1.12
 linkify =
     linkify-it-py~=1.0
+plugins =
+    mdit-py-plugins
 rtd =
     myst-nb~=0.11.1
     pyyaml