diff --git a/CHANGELOG.md b/CHANGELOG.md index 3401870..a6d64a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,8 @@ -## 0.7 (Not Releases) +## 0.7.0 ### Prs in Release - - [Fix section case](https://github.com/jdoiro3/mkdocs-multirepo-plugin/pull/124) +- [Remove deprecation warning](https://github.com/jdoiro3/mkdocs-multirepo-plugin/pull/131) ## 0.6.3 diff --git a/mkdocs_multirepo_plugin/structure.py b/mkdocs_multirepo_plugin/structure.py index 8a81603..11dce15 100644 --- a/mkdocs_multirepo_plugin/structure.py +++ b/mkdocs_multirepo_plugin/structure.py @@ -7,7 +7,7 @@ from typing import Callable, Dict, List, Optional, Tuple, Union from mkdocs.config import Config -from mkdocs.structure.files import File, Files, _filter_paths, _sort_files +from mkdocs.structure.files import File, Files, _sort_files from mkdocs.utils import yaml_load from slugify import slugify @@ -433,25 +433,16 @@ async def batch_import( def get_files(config: Config, repo: DocsRepo) -> Files: """Walk the `docs_dir` and return a Files collection.""" files = [] - exclude = [".*", "/templates"] for source_dir, dirnames, filenames in os.walk(repo.location, followlinks=True): relative_dir = os.path.relpath(source_dir, repo.temp_dir) for dirname in list(dirnames): path = os.path.normpath(os.path.join(relative_dir, dirname)) - # Skip any excluded directories - if _filter_paths(basename=dirname, path=path, is_dir=True, exclude=exclude): - dirnames.remove(dirname) dirnames.sort() for filename in _sort_files(filenames): path = os.path.normpath(os.path.join(relative_dir, filename)) - # Skip any excluded files - if _filter_paths( - basename=filename, path=path, is_dir=False, exclude=exclude - ): - continue # Skip README.md if an index file also exists in dir if filename == "README.md" and "index.md" in filenames: log.warning( diff --git a/mkdocs_multirepo_plugin/util.py b/mkdocs_multirepo_plugin/util.py index 24be6e9..6d5e1db 100644 --- a/mkdocs_multirepo_plugin/util.py +++ b/mkdocs_multirepo_plugin/util.py @@ -7,14 +7,12 @@ from sys import platform, version_info from typing import Any, Dict -from mkdocs.utils import warning_filter - # used for getting Git version GitVersion = namedtuple("GitVersion", "major minor") LINUX_LIKE_PLATFORMS = ["linux", "linux2", "darwin"] +# This is a global variable imported by other modules log = logging.getLogger("mkdocs.plugins." + __name__) -log.addFilter(warning_filter) class ImportDocsException(Exception): diff --git a/pyproject.toml b/pyproject.toml index 0af96d2..bbcd94a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "mkdocs-multirepo-plugin" -version = "0.6.3" +version = "0.7.0" description = "Build documentation in multiple repos into one site." authors = ["jdoiro3 "] license = "MIT"