diff --git a/CHANGELOG b/CHANGELOG index 058ed71f1..a379a8a35 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +mkdocs-material-9.1.20 (2023-07-27) + + * Fixed deprecation warnings for social plugin + mkdocs-material-9.1.19 (2023-07-18) * Added support for MkDocs 1.5+ diff --git a/docs/changelog/index.md b/docs/changelog/index.md index 8758fff78..3faf7ac51 100644 --- a/docs/changelog/index.md +++ b/docs/changelog/index.md @@ -25,6 +25,11 @@ - Updated MkDocs to 1.5.0 - Fixed rendering of tags when announcement bar is present +### 9.1.20 July 27, 2023 { id="9.1.20" } + +- Updated Sanskrit translations +- Fixed deprecation warnings for social plugin + ### 9.1.19 July 18, 2023 { id="9.1.19" } - Added support for MkDocs 1.5+ diff --git a/docs/guides/creating-a-reproduction.md b/docs/guides/creating-a-reproduction.md index 7aa43d7bd..cb4cb07b9 100644 --- a/docs/guides/creating-a-reproduction.md +++ b/docs/guides/creating-a-reproduction.md @@ -93,7 +93,7 @@ inside it. Next: non-essential lines and files. [bug reporting guide]: ../contributing/reporting-a-bug.md#upgrade-to-latest-version - [minimal configuration]: ../../creating-your-site/#minimal-configuration + [minimal configuration]: ../creating-your-site.md#minimal-configuration ### Creating a .zip file diff --git a/material/plugins/social/plugin.py b/material/plugins/social/plugin.py index 400615035..35770a9e9 100644 --- a/material/plugins/social/plugin.py +++ b/material/plugins/social/plugin.py @@ -48,7 +48,6 @@ class SocialPlugin(BasePlugin[SocialConfig]): def __init__(self): self._executor = concurrent.futures.ThreadPoolExecutor(4) - self.custom_dir = None # Retrieve configuration def on_config(self, config): @@ -107,13 +106,6 @@ class SocialPlugin(BasePlugin[SocialConfig]): "text": options.get("color", self.color["text"]) } - # Retrieve custom_dir path - for user_config in config.user_configs: - custom_dir = user_config.get("theme", {}).get("custom_dir") - if custom_dir: - self.custom_dir = custom_dir - break - # Retrieve logo and font self._resized_logo_promise = self._executor.submit(self._load_resized_logo, config) self.font = self._load_font(config) @@ -365,8 +357,8 @@ class SocialPlugin(BasePlugin[SocialConfig]): path = os.path.join(config.docs_dir, theme["logo"]) # Allow users to put the logo inside their custom_dir (theme["logo"] case) - if self.custom_dir: - custom_dir_logo = os.path.join(self.custom_dir, theme["logo"]) + if theme.custom_dir: + custom_dir_logo = os.path.join(theme.custom_dir, theme["logo"]) if os.path.exists(custom_dir_logo): path = custom_dir_logo @@ -393,8 +385,8 @@ class SocialPlugin(BasePlugin[SocialConfig]): path = f"{base}/.icons/{logo}.svg" # Allow users to put the logo inside their custom_dir (theme["icon"]["logo"] case) - if self.custom_dir: - custom_dir_logo = os.path.join(self.custom_dir, ".icons", f"{logo}.svg") + if theme.custom_dir: + custom_dir_logo = os.path.join(theme.custom_dir, ".icons", f"{logo}.svg") if os.path.exists(custom_dir_logo): path = custom_dir_logo diff --git a/src/plugins/social/plugin.py b/src/plugins/social/plugin.py index 400615035..35770a9e9 100644 --- a/src/plugins/social/plugin.py +++ b/src/plugins/social/plugin.py @@ -48,7 +48,6 @@ class SocialPlugin(BasePlugin[SocialConfig]): def __init__(self): self._executor = concurrent.futures.ThreadPoolExecutor(4) - self.custom_dir = None # Retrieve configuration def on_config(self, config): @@ -107,13 +106,6 @@ class SocialPlugin(BasePlugin[SocialConfig]): "text": options.get("color", self.color["text"]) } - # Retrieve custom_dir path - for user_config in config.user_configs: - custom_dir = user_config.get("theme", {}).get("custom_dir") - if custom_dir: - self.custom_dir = custom_dir - break - # Retrieve logo and font self._resized_logo_promise = self._executor.submit(self._load_resized_logo, config) self.font = self._load_font(config) @@ -365,8 +357,8 @@ class SocialPlugin(BasePlugin[SocialConfig]): path = os.path.join(config.docs_dir, theme["logo"]) # Allow users to put the logo inside their custom_dir (theme["logo"] case) - if self.custom_dir: - custom_dir_logo = os.path.join(self.custom_dir, theme["logo"]) + if theme.custom_dir: + custom_dir_logo = os.path.join(theme.custom_dir, theme["logo"]) if os.path.exists(custom_dir_logo): path = custom_dir_logo @@ -393,8 +385,8 @@ class SocialPlugin(BasePlugin[SocialConfig]): path = f"{base}/.icons/{logo}.svg" # Allow users to put the logo inside their custom_dir (theme["icon"]["logo"] case) - if self.custom_dir: - custom_dir_logo = os.path.join(self.custom_dir, ".icons", f"{logo}.svg") + if theme.custom_dir: + custom_dir_logo = os.path.join(theme.custom_dir, ".icons", f"{logo}.svg") if os.path.exists(custom_dir_logo): path = custom_dir_logo