Merge branch 'master' into src-none

Author: chrisjsewell

.pre-commit-config.yaml

@@ -16,36 +16,40 @@ exclude: >
 repos:
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v3.3.0
+    rev: v3.4.0
     hooks:
     - id: check-json
     - id: check-yaml
     - id: end-of-file-fixer
     - id: trailing-whitespace
 
   - repo: https://github.com/mgedmin/check-manifest
-    rev: "0.44"
+    rev: "0.46"
     hooks:
     - id: check-manifest
+      args: [--no-build-isolation]
+      additional_dependencies: [setuptools>=46.4.0]
+
+  # this is not used for now,
+  # since it converts markdown-it-py to markdown_it_py and removes comments
+  # - repo: https://github.com/asottile/setup-cfg-fmt
+  #   rev: v1.17.0
+  #   hooks:
+  #   - id: setup-cfg-fmt
 
   - repo: https://github.com/psf/black
     rev: 20.8b1
     hooks:
     - id: black
 
   - repo: https://gitlab.com/pycqa/flake8
-    rev: 3.8.4
+    rev: 3.9.1
     hooks:
     - id: flake8
       additional_dependencies: [flake8-bugbear==21.3.1]
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.790
+    rev: v0.812
     hooks:
     - id: mypy
       additional_dependencies: [attrs]
-
-  - repo: https://github.com/asottile/setup-cfg-fmt
-    rev: v1.16.0
-    hooks:
-    - id: setup-cfg-fmt

docs/conf.py

@@ -51,6 +51,7 @@
     ("py:class", "markdown_it.helpers.parse_link_destination._Result"),
     ("py:class", "markdown_it.helpers.parse_link_title._Result"),
     ("py:class", "MarkdownIt"),
+    ("py:class", "_NodeType"),
 ]
 
 

markdown_it/common/utils.py

@@ -2,13 +2,14 @@
 """
 import html
 import re
+from typing import Any
 
 from .entities import entities
 
 # from .normalize_url import unescape_string
 
 
-def charCodeAt(src: str, pos: int):
+def charCodeAt(src: str, pos: int) -> Any:
     """
     Returns the Unicode value of the character at the specified location.
 
@@ -26,12 +27,11 @@ def charCodeAt(src: str, pos: int):
 # function _class(obj) { return Object.prototype.toString.call(obj); }
 
 
-def isString(obj):
+def isString(obj: object) -> bool:
     return isinstance(obj, str)
 
 
-def has(object, key):
-    return hasattr(object, key)
+has = hasattr
 
 
 # Merge objects
@@ -56,18 +56,18 @@ def assign(obj):
     # return obj
 
 
-def arrayReplaceAt(src: list, pos: int, newElements: list):
+def arrayReplaceAt(src: list, pos: int, newElements: list) -> list:
     """
     Remove element from array and put another array at those position.
     Useful for some operations with tokens
     """
-    return src[0:pos] + newElements + src[pos + 1 :]
+    return src[:pos] + newElements + src[pos + 1 :]
 
 
 ######################################################################
 
 
-def isValidEntityCode(c):
+def isValidEntityCode(c: int) -> bool:
 
     # broken sequence
     if c >= 0xD800 and c <= 0xDFFF:
@@ -111,7 +111,7 @@ def fromCodePoint(c: int) -> str:
 DIGITAL_ENTITY_TEST_RE = re.compile(r"^#((?:x[a-f0-9]{1,8}|[0-9]{1,8}))", re.IGNORECASE)
 
 
-def replaceEntityPattern(match, name):
+def replaceEntityPattern(match: str, name: str) -> str:
     """Convert HTML entity patterns
 
     ::
@@ -138,22 +138,22 @@ def replaceEntityPattern(match, name):
 #   return string.replace(ENTITY_RE, replaceEntityPattern)
 
 
-def unescapeMd(string: str):
+def unescapeMd(string: str) -> str:
     raise NotImplementedError
     # if "\\" in string:
     #     return string
     # return string.replace(UNESCAPE_MD_RE, "$1")
 
 
-def unescapeAll(string: str):
+def unescapeAll(string: str) -> str:
     return html.unescape(string)
 
 
 ESCAPABLE = r"""\\!"#$%&'()*+,./:;<=>?@\[\]^`{}|_~-"""
 ESCAPE_CHAR = re.compile(r"\\([" + ESCAPABLE + r"])")
 
 
-def stripEscape(string):
+def stripEscape(string: str) -> str:
     """Strip escape \\ characters"""
     return ESCAPE_CHAR.sub(r"\1", string)
 
@@ -179,7 +179,7 @@ def stripEscape(string):
 #     return string
 
 
-def escapeHtml(raw: str):
+def escapeHtml(raw: str) -> str:
     # return html.escape(html.unescape(raw)).replace("&#x27;", "'")
     return html.escape(raw).replace("&#x27;", "'")
 
@@ -197,7 +197,7 @@ def escapeRE(string: str) -> str:
 # //////////////////////////////////////////////////////////////////////////////
 
 
-def isSpace(code) -> bool:
+def isSpace(code: object) -> bool:
     return code in {0x09, 0x20}
 
 
@@ -271,7 +271,7 @@ def isPunctChar(ch: str) -> bool:
 }
 
 
-def isMdAsciiPunct(ch: int):
+def isMdAsciiPunct(ch: int) -> bool:
     """Markdown ASCII punctuation characters.
 
     ::

setup.cfg

@@ -1,5 +1,5 @@
 [metadata]
-name = markdown_it_py
+name = markdown-it-py
 version = attr: markdown_it.__version__
 description = Python port of markdown-it. Markdown parsing, done right!
 long_description = file: README.md
@@ -52,7 +52,7 @@ linkify =
 plugins =
     mdit-py-plugins
 rtd =
-    myst-nb~=0.11.1
+    myst-nb==0.13.0a1
     pyyaml
     sphinx>=2,<4
     sphinx-copybutton