Merge branch 'master' into merge/piri-piri

Author: squidfunk

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+

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 <small>July 27, 2023</small> { id="9.1.20" }
+
+- Updated Sanskrit translations
+- Fixed deprecation warnings for social plugin
+
 ### 9.1.19 <small>July 18, 2023</small> { id="9.1.19" }
 
 - Added support for MkDocs 1.5+

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
 

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 @@ def on_config(self, config):
             "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 @@ def _load_logo(self, config):
             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 @@ def _load_logo(self, config):
         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
 

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 @@ def on_config(self, config):
             "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 @@ def _load_logo(self, config):
             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 @@ def _load_logo(self, config):
         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