Merge branch 'release/v2.2.0' into feature/encryptcontent

Author: neatc0der

.github/workflows/distribute.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Prepare Python
         uses: actions/setup-python@v2
         with:
-          python-version: 3.8 
+          python-version: 3.9
 
       - name: Install Dependencies
         run: |
@@ -28,4 +28,4 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           TWINE_PASSWORD: ${{ secrets.TWINE_TOKEN }}
-        run: inv distribute --tag ${GITHUB_REF#refs/*/} --no-dry-run
+        run: inv distribute --tag v$(python setup.py --version 2> /dev/null) --no-dry-run

.github/workflows/release.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Prepare Python
         uses: actions/setup-python@v2
         with:
-          python-version: 3.8 
+          python-version: 3.9
 
       - name: Install Dependencies
         run: |

.github/workflows/verify.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Prepare Python
         uses: actions/setup-python@v2
         with:
-          python-version: 3.8 
+          python-version: 3.9
 
       - name: Install Dependencies
         run: |

README.md

@@ -14,7 +14,7 @@ This is a plugin and an extension for [mkdocs](https://github.com/mkdocs/mkdocs/
 
 This plugin was tested with, but is not limited to:
 
-* Python 3.8
+* Python 3.9
 * mkdocs 1.1
 
 ## Quickstart
@@ -73,7 +73,7 @@ plugins:
       encoding: utf-8
       file_extension: .mm.md
       d3_version: 6.7.0
-      lib_version: 0.11.5
+      lib_version: 0.11.6
       view_version: 0.2.6
 ```
 
@@ -82,7 +82,7 @@ In addition, feel free to define your favourite source urls like this:
 ```yaml
 extra_javascript:
   - https://unpkg.com/[email protected]/dist/d3.min.js
-  - https://unpkg.com/[email protected].5/dist/browser/index.min.js
+  - https://unpkg.com/[email protected].6/dist/browser/index.min.js
   - https://unpkg.com/[email protected]/dist/index.min.js
 ```
 
@@ -92,6 +92,15 @@ extra_javascript:
 * `markmap-lib`
 * `markmap-view`
 
+
+## Troubleshooting
+
+### Nav tree lists markmaps
+
+1. Move your markmap files to a separate folder next to `docs`, e.g. `mindmaps`
+2. Configure `base_path` accordingly (see [Advanced Settings](#advanced-settings))
+
+
 ## Credits :clap:
 
 Some of the development approaches are based on implementations provided by the following projects:

changelog/v2.1.2.md

@@ -2,4 +2,3 @@
 
 * Fixes [superfences bug](https://github.com/neatc0der/mkdocs-markmap/issues/19)
 * Updates distribute workflow
-

changelog/v2.1.3.md

@@ -0,0 +1,3 @@
+# v2.1.3
+
+* Fixes [superfences 9.0 bug](https://github.com/neatc0der/mkdocs-markmap/issues/27)

changelog/v2.2.0.md

@@ -0,0 +1,3 @@
+# v2.2.0
+
+* Fixes distribute workflow

mkdocs_markmap/__meta__.py

@@ -1,6 +1,6 @@
 PACKAGE_NAME = 'mkdocs_markmap'
 PROJECT_NAME = PACKAGE_NAME.replace('_', '-')
-PROJECT_VERSION = '2.1.2'
+PROJECT_VERSION = '2.2.0'
 
 OWNER = 'neatc0der'
 REPOSITORY_NAME = f'{OWNER}/{PROJECT_NAME}'

mkdocs_markmap/defaults.py

@@ -14,7 +14,7 @@ class JsModuleConfig(object):
 )
 
 MARKMAP_LIB: JsModuleConfig = JsModuleConfig(
-    version='0.11.5',
+    version='0.11.6',
     uri='https://unpkg.com/markmap-lib@{}/dist/browser/index.min.js',
 )
 

mkdocs_markmap/extension.py

@@ -94,17 +94,18 @@ def extendMarkdown(self, md: Markdown, md_globals: Dict[str, str]) -> None:
         md.preprocessors.register(MarkmapPreprocessor(md, self.getConfigs()), 'include_markmap', 102)
         for extension in md.registeredExtensions:
             if extension.__class__.__name__ == 'SuperFencesCodeExtension':
+                log.info(f'superfences detected by markmap')
                 try:
                     from pymdownx.superfences import default_validator, fence_code_format, _formatter, _validator
                     extension.extend_super_fences(
                         'markmap',
                         partial(_formatter, class_name='language-markmap', _fmt=fence_code_format),
-                        partial(_validator, validator=default_validator, _legacy=False)
+                        partial(_validator, validator=default_validator)
                     )
                     break
 
                 except ImportError as e:
-                    log.warning(f'detected pymdownx.superfences, but import is not working: {e}')
+                    log.warning(f'markmap detected pymdownx.superfences, but import is not working: {e}')
 
                 except Exception as e:
                     log.error(f'unexpected error: {e}')