test: resolve tox failures

Author: KyleKing

mdformat_mkdocs/_postprocess_inline.py

@@ -41,12 +41,12 @@ def postprocess_list_wrap(
     ):
         return text
 
-    _counter = -1
+    counter_ = -1
     parent = node.parent
     while parent and parent.type == "paragraph":
         parent = parent.parent
-        _counter += 1
-    indent_count = max(_counter, 0)
+        counter_ += 1
+    indent_count = max(counter_, 0)
 
     soft_break = "\x00"
     text = text.lstrip(soft_break).lstrip()

mdformat_mkdocs/mdit_plugins/_material_content_tabs.py

@@ -31,7 +31,8 @@
 """
 
 from markdown_it.rules_block import StateBlock
-from mdformat_admon.factories import (
+
+from mdformat_mkdocs._synced.admon_factories import (
     AdmonitionData,
     admon_plugin_factory,
     new_token,

mdformat_mkdocs/mdit_plugins/_mkdocstrings_autorefs.py

@@ -18,7 +18,8 @@
 from markdown_it import MarkdownIt
 from markdown_it.rules_block import StateBlock
 from markdown_it.rules_inline import StateInline
-from mdformat_admon.factories import new_token
+
+from mdformat_mkdocs._synced.admon_factories import new_token
 
 _AUTOREFS_PATTERN = re.compile(r"\[\]\(<?>?\){#(?P<anchor>[^ }]+)}")
 _HEADING_PATTERN = re.compile(r"(?P<markdown>^#{1,6}) (?P<content>.+)")

mdformat_mkdocs/mdit_plugins/_mkdocstrings_crossreference.py

@@ -15,7 +15,8 @@
 
 from markdown_it import MarkdownIt
 from markdown_it.rules_inline import StateInline
-from mdformat_admon.factories import new_token
+
+from mdformat_mkdocs._synced.admon_factories import new_token
 
 _CROSSREFERENCE_PATTERN = re.compile(r"\[(?P<link>[^[|\]\n]+)\]\[(?P<href>[^\]\n]*)\]")
 MKDOCSTRINGS_CROSSREFERENCE_PREFIX = "mkdocstrings_crossreference"

mdformat_mkdocs/mdit_plugins/_python_markdown_admon.py

@@ -6,7 +6,7 @@
 
 from markdown_it.rules_block import StateBlock
 
-from mdformat_admon._synced.admon_factories import (
+from mdformat_mkdocs._synced.admon_factories import (
     AdmonitionData,
     admon_plugin_factory,
     new_token,

mdformat_mkdocs/plugin.py

@@ -157,11 +157,7 @@ def render_admon_title(
 
 
 def add_extra_admon_newline(node: RenderTreeNode, context: RenderContext) -> str:
-    """Return admonition with additional newline after the title.
-
-    See: https://github.com/KyleKing/mdformat-admon/pull/22
-
-    """
+    """Return admonition with additional newline after the title for mkdocs."""
     result = render_admon(node, context)
     if "\n" not in result:
         return result

pyproject.toml

@@ -14,7 +14,6 @@ classifiers = [
 ]
 dependencies = [
   "mdformat >= 0.7.19",
-  "mdformat-admon >= 2.0.6",
   "mdformat-gfm >= 0.3.6",
   "mdit-py-plugins >= 0.4.1",
   "more-itertools >= 10.5.0",
@@ -85,7 +84,7 @@ ignore_patterns = []
 now = true
 patterns = ["*.ambr", "*.md", "*.py"]
 runner = "tox"
-runner_args = ["-e", "py312-beartype"]
+runner_args = ["-e", "py312-test", "--", "--exitfirst", "--failed-first", "--new-first", "-vv", "--beartype-packages=mdformat_mkdocs", "--snapshot-update"]
 
 [tool.ruff]
 # Docs: https://github.com/charliermarsh/ruff
@@ -152,22 +151,20 @@ all = true
 in_place = true
 trailing_comma_inline_array = true
 
+[tool.tomlsort.overrides."tool.pytest-watcher.*"]
+inline_arrays = false
+
 [tool.tomlsort.overrides."tool.tox.env.*"]
 inline_arrays = false
 
 [tool.tox]
 # Docs: https://tox.wiki/en/4.23.2/config.html#core
 basepython = ["python3.12", "python3.9"]
-env_list = ["py12-test", "py312-pre-commit", "py312-ruff", "py312-type", "py39-hook", "py39-test"]
+env_list = ["py312-pre-commit", "py312-ruff", "py312-test", "py312-type", "py39-hook", "py39-test"]
 isolated_build = true
 requires = ["tox>=4.20.0"]
 skip_missing_interpreters = false
 
-[tool.tox.env."py12-test"]
-commands = [["pytest", "--cov=mdformat_mkdocs", {default = [], extend = true, replace = "posargs"}]]
-deps = ["--requirement=tests/requirements.txt"]
-description = "Optionally, specify: '--exitfirst --failed-first --new-first -vv --beartype-packages=mdformat_mkdocs'"
-
 [tool.tox.env."py312-pre-commit"]
 commands = [["pre-commit", "run", "--all-files", {default = [], extend = true, replace = "posargs"}]]
 deps = "pre-commit>=4.0.1"
@@ -182,18 +179,22 @@ deps = "ruff>=0.8.3"
 description = "Optionally, specify: '--unsafe-fixes'"
 skip_install = true
 
+[tool.tox.env."py312-test"]
+commands = [["pytest", "--cov=mdformat_mkdocs", {default = [], extend = true, replace = "posargs"}]]
+description = "Optionally, specify: '--exitfirst --failed-first --new-first -vv --beartype-packages=mdformat_mkdocs --snapshot-update"
+extras = ["test"]
+
 [tool.tox.env."py312-type"]
 commands = [["mypy", "./mdformat_mkdocs", {default = [], extend = true, replace = "posargs"}]]
 deps = ["mypy>=1.13.0"]
 
 [tool.tox.env."py39-hook"]
 commands = [["pre-commit", "run", "--config=.pre-commit-test.yaml", "--all-files", {default = ["--show-diff-on-failure", "--verbose"], extend = true, replace = "posargs"}]]
 deps = "pre-commit>=4.0.1"
-skip_install = true
 
 [tool.tox.env."py39-test"]
 commands = [["pytest", "--cov=mdformat_mkdocs"]]
-deps = ["--requirement=tests/requirements.txt"]
+extras = ["test"]
 
 [tool.tox.env_run_base]
 # Validates that commands are set

tests/format/fixtures/text.md

@@ -1402,6 +1402,7 @@ More complex example to validate formatting when nested
                 ===+ "Third"
 
                     - List Item
+
                     - Another Item
 
                         === "Fourth"