Skip to content

Merge dev into main #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Apr 29, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# SPDX License ID: LGPL-2.1
.idea
__pycache*
.DS_Store
13 changes: 9 additions & 4 deletions Addon.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
}


Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion AddonCatalog.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Loading