.drone.yml

@@ -99,10 +99,5 @@ steps:
 # using [twine](https://twine.readthedocs.io). Mostly to jog the developer's
 # memory, when a new release is freshly built, the command to update PyPI is
 # `twine upload dist/*`. Also don't forget to create a fresh release on the
-# repository site as well. Finally, you can manually upload the new doc pages
+# repository site as well.
-# for mkdocs-semiliterate itself so the pages can be served by moving the
-# newly-produced `site` directory to `semiliterate` and then executing
-#
-# `scp -r -i [IDENTITY_FILE] semiliterate [USER]@[SERVER]:/opt/bitnami/apps/wordpress/htdocs`
-#
 ###

mkdocs_semiliterate/plugin.py

@@ -375,9 +375,7 @@ terminate: '^\s*\)'
 
     # Override rather than extend so that we use Semisimple instead of simple
     # Note code must track mkdocs_simple_plugin, with the added section for
-    # the custom_dir at the bottom. Also removed a section about removing
+    # the custom_dir at the bottom.
-    # files from the docs dir if not merging; it was unclear how it was
-    # supposed to work, and it would crash whenever it triggered anyway.
     def on_files(self, files: Files, /, *,
                  config: MkDocsConfig):
         """Update files based on plugin settings."""
@@ -390,9 +388,12 @@ terminate: '^\s*\)'
             self.dirty, self.last_build_time, do_copy)
         self.last_build_time = time.time()
 
-        # Code section from mkdocs_simple_plugin has been CUT FROM HERE
+        if not self.config["merge_docs_dir"]:
-        # If not merging, remove files that are from the docs dir
+            # If not merging, remove files that are from the docs dir
-        # End of CUT FROM HERE
+            abs_docs_dir = os.path.abspath(config['docs_dir'])
+            for _, file in files.src_uris.items():
+                if file.abs_src_path.startswith(abs_docs_dir):
+                    files.remove(file)
 
         for path in self.paths:
             file = File(

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = mkdocs-semiliterate
-version = 0.8.3
+version = 0.8.2
 description = Extension of mkdocs-simple-plugin adding easy content inclusion
 long_description = file: README.md
 long_description_content_type = text/markdown