Merge pull request #57 from FreeCAD/dev

Merge dev into main

Author: chennes

.gitignore

@@ -1,3 +1,4 @@
 # SPDX License ID: LGPL-2.1
 .idea
 __pycache*
+.DS_Store

Addon.py

@@ -49,21 +49,26 @@
 
 #  A list of internal workbenches that can be used as a dependency of an Addon
 INTERNAL_WORKBENCHES = {
-    "bim": "BIM",
     "assembly": "Assembly",
+    "bim": "BIM",
+    "cam": "CAM",
     "draft": "Draft",
     "fem": "FEM",
+    "import": "Import",
+    "material": "Material",
     "mesh": "Mesh",
     "openscad": "OpenSCAD",
     "part": "Part",
     "partdesign": "PartDesign",
-    "cam": "CAM",
     "plot": "Plot",
     "points": "Points",
+    "reverseengineering": "ReverseEngineering",
     "robot": "Robot",
     "sketcher": "Sketcher",
     "spreadsheet": "Spreadsheet",
     "techdraw": "TechDraw",
+    "tux": "Tux",
+    "web": "Web",
 }
 
 
@@ -416,7 +421,7 @@ def extract_metadata_dependencies(self, metadata: Metadata):
 
         for dep in metadata.depend:
             if dep.dependency_type == DependencyType.internal:
-                if dep.package in INTERNAL_WORKBENCHES:
+                if dep.package.strip().lower() in INTERNAL_WORKBENCHES:
                     self.requires.add(dep.package)
                 else:
                     fci.Console.PrintWarning(
@@ -815,7 +820,7 @@ def __init__(self, repo: Addon, all_repos: List[Addon]):
                     except ImportError:
                         # Plot might fail for a number of reasons
                         self.wbs.append(dep)
-                        fci.Console.PrintLog("Failed to import Plot module")
+                        fci.Console.PrintLog("Failed to import Plot module\n")
                 else:
                     self.wbs.append(dep)
 

AddonCatalog.py

@@ -89,7 +89,7 @@ def __init__(self, data: Dict[str, Any]):
     def _parse_raw_data(self):
         self._dictionary = {}  # Clear pre-existing contents
         for key, value in self._original_data.items():
-            if key == "_meta":  # Don't add the documentation object to the tree
+            if key in ["_meta", "$schema"]:  # Don't add the documentation objects to the tree
                 continue
             self._dictionary[key] = []
             for entry in value: