Skip to content

Commit 9eabf21

Browse files
committed
Improve support for dependencies on internal workbenches
1 parent ccc5986 commit 9eabf21

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

Addon.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,21 +49,26 @@
4949

5050
# A list of internal workbenches that can be used as a dependency of an Addon
5151
INTERNAL_WORKBENCHES = {
52-
"bim": "BIM",
5352
"assembly": "Assembly",
53+
"bim": "BIM",
54+
"cam": "CAM",
5455
"draft": "Draft",
5556
"fem": "FEM",
57+
"import": "Import",
58+
"material": "Material",
5659
"mesh": "Mesh",
5760
"openscad": "OpenSCAD",
5861
"part": "Part",
5962
"partdesign": "PartDesign",
60-
"cam": "CAM",
6163
"plot": "Plot",
6264
"points": "Points",
65+
"reverseengineering": "ReverseEngineering",
6366
"robot": "Robot",
6467
"sketcher": "Sketcher",
6568
"spreadsheet": "Spreadsheet",
6669
"techdraw": "TechDraw",
70+
"tux": "Tux",
71+
"web": "Web",
6772
}
6873

6974

@@ -416,7 +421,7 @@ def extract_metadata_dependencies(self, metadata: Metadata):
416421

417422
for dep in metadata.depend:
418423
if dep.dependency_type == DependencyType.internal:
419-
if dep.package in INTERNAL_WORKBENCHES:
424+
if dep.package.strip().lower() in INTERNAL_WORKBENCHES:
420425
self.requires.add(dep.package)
421426
else:
422427
fci.Console.PrintWarning(
@@ -815,7 +820,7 @@ def __init__(self, repo: Addon, all_repos: List[Addon]):
815820
except ImportError:
816821
# Plot might fail for a number of reasons
817822
self.wbs.append(dep)
818-
fci.Console.PrintLog("Failed to import Plot module")
823+
fci.Console.PrintLog("Failed to import Plot module\n")
819824
else:
820825
self.wbs.append(dep)
821826

0 commit comments

Comments
 (0)