Merge pull request #1101 from josh-gree/master

Fix for #1100
greenape · Aug 7, 2023 · 408e3fd · 408e3fd
2 parents 026a5b2 + 12993ea
commit 408e3fd
Show file tree

Hide file tree

Showing 10 changed files with 2,846 additions and 2,142 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 
 ### Fixed
+- Fixed import error with MkdDocs > 1.5.0. [#1000](https://github.com/greenape/mknotebooks/issues/100). (Thanks to [@josh-gree](https://github.com/josh-gree))
 
 
 ### Removed

diff --git a/examples/binder_logo/Pipfile.lock b/examples/binder_logo/Pipfile.lock
diff --git a/examples/binder_logo/docs/docs_example.ipynb b/examples/binder_logo/docs/docs_example.ipynb
@@ -40,6 +40,7 @@
     "import pandas as pd\n",
     "import numpy as np\n",
     "import datetime\n",
+    "\n",
     "%matplotlib inline"
    ]
   },
@@ -80,8 +81,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "df = pd.DataFrame({\"time\":np.arange(0, 10, 0.1)})\n",
-    "df[\"amplitude\"] =  np.sin(df.time)"
+    "df = pd.DataFrame({\"time\": np.arange(0, 10, 0.1)})\n",
+    "df[\"amplitude\"] = np.sin(df.time)"
    ]
   },
   {

diff --git a/examples/cell_tag_remove/Pipfile.lock b/examples/cell_tag_remove/Pipfile.lock
diff --git a/examples/cell_tag_remove/docs/docs_example.ipynb b/examples/cell_tag_remove/docs/docs_example.ipynb
@@ -43,6 +43,7 @@
     "import pandas as pd\n",
     "import numpy as np\n",
     "import datetime\n",
+    "\n",
     "%matplotlib inline"
    ]
   },
@@ -87,8 +88,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "df = pd.DataFrame({\"time\":np.arange(0, 10, 0.1)})\n",
-    "df[\"amplitude\"] =  np.sin(df.time)"
+    "df = pd.DataFrame({\"time\": np.arange(0, 10, 0.1)})\n",
+    "df[\"amplitude\"] = np.sin(df.time)"
    ]
   },
   {

diff --git a/examples/execute_with_preamble/Pipfile.lock b/examples/execute_with_preamble/Pipfile.lock
diff --git a/examples/execute_with_preamble/docs/docs_example.ipynb b/examples/execute_with_preamble/docs/docs_example.ipynb
@@ -40,6 +40,7 @@
     "import pandas as pd\n",
     "import numpy as np\n",
     "import datetime\n",
+    "\n",
     "%matplotlib inline"
    ]
   },
@@ -80,8 +81,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "df = pd.DataFrame({\"time\":np.arange(0, 10, 0.1)})\n",
-    "df[\"amplitude\"] =  np.sin(df.time)"
+    "df = pd.DataFrame({\"time\": np.arange(0, 10, 0.1)})\n",
+    "df[\"amplitude\"] = np.sin(df.time)"
    ]
   },
   {

diff --git a/examples/no_code/Pipfile.lock b/examples/no_code/Pipfile.lock
diff --git a/examples/no_code/docs/docs_example.ipynb b/examples/no_code/docs/docs_example.ipynb
@@ -40,6 +40,7 @@
     "import pandas as pd\n",
     "import numpy as np\n",
     "import datetime\n",
+    "\n",
     "%matplotlib inline"
    ]
   },
@@ -80,8 +81,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "df = pd.DataFrame({\"time\":np.arange(0, 10, 0.1)})\n",
-    "df[\"amplitude\"] =  np.sin(df.time)"
+    "df = pd.DataFrame({\"time\": np.arange(0, 10, 0.1)})\n",
+    "df[\"amplitude\"] = np.sin(df.time)"
    ]
   },
   {

diff --git a/mknotebooks/plugin.py b/mknotebooks/plugin.py
@@ -14,7 +14,7 @@
 import git
 from mkdocs.config.base import Config as MkDocsConfig
 from mkdocs.structure.files import File, Files
-from mkdocs.structure.pages import Page, _RelativePathExtension
+from mkdocs.structure.pages import Page, _RelativePathTreeprocessor
 from mkdocs.structure.toc import get_toc
 from nbconvert import HTMLExporter, MarkdownExporter
 from traitlets.config import Config
@@ -34,7 +34,6 @@
 
 
 def get_git_root(path):
-
     git_repo = git.Repo(path, search_parent_directories=True)
     git_root = git_repo.git.rev_parse("--show-toplevel")
     return git_root
@@ -295,12 +294,15 @@ def on_page_content(
         ):
             log.debug(f"Re-rendering page with markdown in divs: {page}")
             extensions = [
-                _RelativePathExtension(page.file, files),
                 "markdown.extensions.md_in_html",
             ] + config["markdown_extensions"]
             md = markdown.Markdown(
                 extensions=extensions, extension_configs=config["mdx_configs"] or {}
             )
+
+            relative_path_ext = _RelativePathTreeprocessor(page.file, files, config)
+            relative_path_ext._register(md)
+
             html = md.convert(page.markdown)
             page.toc = get_toc(getattr(md, "toc_tokens", []))