Merge branch 'main' into dependabot/pip/pip-60b803aef9

ouhammmourachid · Jul 20, 2024 · bdaf9e1 · bdaf9e1
2 parents db058e7 + 45b7c92
commit bdaf9e1
Show file tree

Hide file tree

Showing 17 changed files with 22 additions and 5 deletions.
diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml
@@ -3,7 +3,9 @@ name: deploy docs
 on:
   push:
     branches:
-      - docs/*
+      - main
+    paths:
+      - 'docs/**'
 
   workflow_dispatch:
 

diff --git a/mermaid/icon.py b/mermaid/icon.py
@@ -5,11 +5,11 @@
 class Icon:
     name: str
     type_: str
-    str_: str = 'v1'
+    version: str = 'v1'
 
     def __str__(self) -> str:
-        if self.str_ == 'v1':
-            return f'{self.type_} {self.name}'
-        elif self.str_ == 'v2':
+        if self.version == 'v1':
             return f'{self.type_} {self.name}'
+        elif self.version == 'v2':
+            return f'{self.type_}:{self.name}'
         return f' {self.type_}:{self.name} '
diff --git a/mermaid/tests/__init__.py → tests/__init__.py b/mermaid/tests/__init__.py → tests/__init__.py
diff --git a/mermaid/tests/test_configuration.py → tests/test_configuration.py b/mermaid/tests/test_configuration.py → tests/test_configuration.py
diff --git a/mermaid/tests/test_erdiagram.py → tests/test_erdiagram.py b/mermaid/tests/test_erdiagram.py → tests/test_erdiagram.py
diff --git a/mermaid/tests/test_flowchart.py → tests/test_flowchart.py b/mermaid/tests/test_flowchart.py → tests/test_flowchart.py
diff --git a/mermaid/tests/test_graph.py → tests/test_graph.py b/mermaid/tests/test_graph.py → tests/test_graph.py
diff --git a/tests/test_icon.py b/tests/test_icon.py
@@ -0,0 +1,15 @@
+import unittest
+
+from mermaid.icon import Icon
+
+
+class TestIcon(unittest.TestCase):
+    def setUp(self) -> None:
+        self.icon_v1 = Icon('icon', 'fa')
+        self.icon_v2 = Icon('icon', 'fa', version='v2')
+        self.icon_v3 = Icon('icon', 'fa', version='v3')
+
+    def test_str(self):
+        self.assertEqual(str(self.icon_v1), 'fa icon')
+        self.assertEqual(str(self.icon_v2), 'fa:icon')
+        self.assertEqual(str(self.icon_v3), ' fa:icon ')
diff --git a/mermaid/tests/test_mermaid.py → tests/test_mermaid.py b/mermaid/tests/test_mermaid.py → tests/test_mermaid.py
diff --git a/mermaid/tests/test_mindmap.py → tests/test_mindmap.py b/mermaid/tests/test_mindmap.py → tests/test_mindmap.py
diff --git a/mermaid/tests/test_piechart.py → tests/test_piechart.py b/mermaid/tests/test_piechart.py → tests/test_piechart.py
diff --git a/mermaid/tests/test_requirementdiagram.py → tests/test_requirementdiagram.py b/mermaid/tests/test_requirementdiagram.py → tests/test_requirementdiagram.py
diff --git a/mermaid/tests/test_sequence.py → tests/test_sequence.py b/mermaid/tests/test_sequence.py → tests/test_sequence.py
diff --git a/mermaid/tests/test_statediagram.py → tests/test_statediagram.py b/mermaid/tests/test_statediagram.py → tests/test_statediagram.py
diff --git a/mermaid/tests/test_style.py → tests/test_style.py b/mermaid/tests/test_style.py → tests/test_style.py
diff --git a/mermaid/tests/test_user_journey.py → tests/test_user_journey.py b/mermaid/tests/test_user_journey.py → tests/test_user_journey.py
diff --git a/mermaid/tests/test_utils.py → tests/test_utils.py b/mermaid/tests/test_utils.py → tests/test_utils.py
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,9 @@ name: deploy docs @@
     on:
       push:
         branches:
-          - docs/*
+          - main
+        paths:
+          - 'docs/**'
       workflow_dispatch:
@@ Expand Down @@