Merge branch 'main' into pre-commit-ci-update-config

executablebooks · Sep 16, 2024 · 8275290 · 8275290
2 parents c03f8ff + b3d6edd
commit 8275290
Show file tree

Hide file tree

Showing 19 changed files with 62,798 additions and 51,663 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -63,7 +63,7 @@ jobs:
       run: |
         pytest --cov=sphinx_design --cov-report=xml --cov-report=term-missing
     - name: Upload to Codecov
-      if: matrix.python-version == '3.9' && matrix.os == 'ubuntu-latest'
+      if: github.event.pull_request.head.repo.full_name == github.repository && matrix.python-version == '3.9' && matrix.os == 'ubuntu-latest'
       uses: codecov/codecov-action@v3
       with:
         token: ${{ secrets.CODECOV_TOKEN }}

diff --git a/docs/badges_buttons.md b/docs/badges_buttons.md
@@ -15,7 +15,10 @@ Badges are available in each semantic color, with filled and outline variants:
 - {bdg-warning}`warning`, {bdg-warning-line}`warning-line`
 - {bdg-danger}`danger`, {bdg-danger-line}`danger-line`
 - {bdg-light}`light`, {bdg-light-line}`light-line`
+- {bdg-muted}`muted`, {bdg-muted-line}`muted-line`
 - {bdg-dark}`dark`, {bdg-dark-line}`dark-line`
+- {bdg-white}`white`, {bdg-white-line}`white-line`
+- {bdg-black}`black`, {bdg-black-line}`black-line`
 
 `````{dropdown-syntax}
 

diff --git a/docs/snippets/myst/badge-basic.txt b/docs/snippets/myst/badge-basic.txt
@@ -14,4 +14,10 @@
 
 {bdg-light}`light`, {bdg-light-line}`light-line`
 
+{bdg-muted}`muted`, {bdg-muted-line}`muted-line`
+
 {bdg-dark}`dark`, {bdg-dark-line}`dark-line`
+
+{bdg-white}`white`, {bdg-white-line}`white-line`
+
+{bdg-black}`black`, {bdg-black-line}`black-line`
diff --git a/docs/snippets/rst/badge-basic.txt b/docs/snippets/rst/badge-basic.txt
@@ -14,4 +14,10 @@
 
 :bdg-light:`light`, :bdg-light-line:`light-line`
 
+:bdg-muted:`muted`, :bdg-muted-line:`muted-line`
+
 :bdg-dark:`dark`, :bdg-dark-line:`dark-line`
+
+:bdg-white:`white`, :bdg-white-line:`white-line`
+
+:bdg-black:`black`, :bdg-black-line:`black-line`
diff --git a/sphinx_design/compiled/material-icons_LICENSE b/sphinx_design/compiled/material-icons_LICENSE
@@ -1,4 +1,4 @@
-   Copyright 2022 Google
+   Copyright 2024 Google
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/sphinx_design/compiled/material-icons_VERSION.txt b/sphinx_design/compiled/material-icons_VERSION.txt
@@ -1,3 +1,3 @@
 using github.com/google/material-design-icons
-v4.0.0-46-gc9e5528
-c9e552847da3445dec2e384e9e2e7230efaca468
+v4.0.0-116-ge9da21
+e9da2194e65080a829d670ae39a99c7b5fc09548
diff --git a/sphinx_design/compiled/material_outlined.json b/sphinx_design/compiled/material_outlined.json
diff --git a/sphinx_design/compiled/material_regular.json b/sphinx_design/compiled/material_regular.json
diff --git a/sphinx_design/compiled/material_round.json b/sphinx_design/compiled/material_round.json
diff --git a/sphinx_design/compiled/material_sharp.json b/sphinx_design/compiled/material_sharp.json
diff --git a/sphinx_design/compiled/material_twotone.json b/sphinx_design/compiled/material_twotone.json
diff --git a/tests/test_misc.py b/tests/test_misc.py
@@ -1,4 +1,6 @@
-from sphinx_design.icons import get_octicon_data
+import pytest
+
+from sphinx_design.icons import get_material_icon_data, get_octicon_data
 
 
 def test_octicons(file_regression):
@@ -10,6 +12,21 @@ def test_octicons(file_regression):
     """
     data = get_octicon_data()
     content = ""
-    for octicon in sorted(get_octicon_data()):
+    for octicon in sorted(data):
         content += f"{octicon}: {','.join(data[octicon]['heights'])}\n"
     file_regression.check(content)
+
+
+@pytest.mark.parametrize("style", ["regular", "outlined", "round", "sharp", "twotone"])
+def test_material(style, file_regression):
+    """Test the available material icons names.
+
+    This is intended to provide a diff of the octicons available,
+    when the octicons are updated, to check if we are removing any
+    (and hence breaking back-compatibility).
+    """
+    data = get_material_icon_data(style)
+    content = ""
+    for name in sorted(data):
+        content += f"{name}: {','.join(data[name]['heights'])}\n"
+    file_regression.check(content)