Skip to content

Commit 8cdd68c

Browse files
committed
[core] Remove packageVersion from the status file
1 parent 4e9ff62 commit 8cdd68c

File tree

3 files changed

+2
-15
lines changed

3 files changed

+2
-15
lines changed

meshroom/core/__init__.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ def loadClasses(folder: str, packageName: str, classType: type) -> list[type]:
7676
package = importlib.import_module(packageName)
7777
packageName = package.packageName if hasattr(package, "packageName") \
7878
else package.__name__
79-
packageVersion = getattr(package, "__version__", None)
8079
packagePath = os.path.dirname(package.__file__)
8180
except Exception as exc:
8281
tb = traceback.extract_tb(exc.__traceback__)
@@ -109,7 +108,6 @@ def loadClasses(folder: str, packageName: str, classType: type) -> list[type]:
109108

110109
for p in plugins:
111110
p.packageName = packageName
112-
p.packageVersion = packageVersion
113111
p.packagePath = packagePath
114112
if classType == desc.BaseNode:
115113
nodePlugin = NodePlugin(p)

meshroom/core/desc/node.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ class BaseNode(object):
3535
gpu = Level.NONE
3636
ram = Level.NORMAL
3737
packageName = ""
38-
packageVersion = ""
3938
internalInputs = [
4039
StringParam(
4140
name="invalidation",

meshroom/core/node.py

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,13 @@ class StatusData(BaseObject):
6767
"""
6868
dateTimeFormatting = '%Y-%m-%d %H:%M:%S.%f'
6969

70-
def __init__(self, nodeName='', nodeType='', packageName='', packageVersion='',
70+
def __init__(self, nodeName='', nodeType='', packageName='',
7171
mrNodeType: MrNodeType = MrNodeType.NONE, parent: BaseObject = None):
7272
super().__init__(parent)
7373

7474
self.nodeName: str = nodeName
7575
self.nodeType: str = nodeType
7676
self.packageName: str = packageName
77-
self.packageVersion: str = packageVersion
7877
self.mrNodeType = mrNodeType
7978

8079
self.sessionUid: Optional[str] = None
@@ -96,7 +95,6 @@ def setNodeType(self, node):
9695
"""
9796
self.nodeType = node.nodeType
9897
self.packageName = node.packageName
99-
self.packageVersion = node.packageVersion
10098
self.mrNodeType = node.getMrNodeType()
10199

102100
def merge(self, other):
@@ -108,7 +106,6 @@ def reset(self):
108106
self.nodeName: str = ""
109107
self.nodeType: str = ""
110108
self.packageName: str = ""
111-
self.packageVersion: str = ""
112109
self.mrNodeType: MrNodeType = MrNodeType.NONE
113110
self.execMode: ExecMode = ExecMode.NONE
114111
self.resetDynamicValues()
@@ -205,7 +202,6 @@ def fromDict(self, d):
205202
self.nodeName = d.get("nodeName", "")
206203
self.nodeType = d.get("nodeType", "")
207204
self.packageName = d.get("packageName", "")
208-
self.packageVersion = d.get("packageVersion", "")
209205
self.graph = d.get("graph", "")
210206
self.commandLine = d.get("commandLine", "")
211207
self.env = d.get("env", "")
@@ -342,7 +338,7 @@ def __init__(self, node, range, parent=None):
342338
self.range = range
343339
self._logManager = None
344340
self._status: StatusData = StatusData(node.name, node.nodeType, node.packageName,
345-
node.packageVersion, node.getMrNodeType())
341+
node.getMrNodeType())
346342
self.statistics: stats.Statistics = stats.Statistics()
347343
self.statusFileLastModTime = -1
348344
self.subprocess = None
@@ -670,7 +666,6 @@ def __init__(self, nodeType: str, position: Position = None, parent: BaseObject
670666
self.nodePlugin = meshroom.core.pluginManager.getRegisteredNodePlugin(nodeType)
671667

672668
self.packageName: str = ""
673-
self.packageVersion: str = ""
674669
self._internalFolder: str = ""
675670
self._sourceCodeFolder: str = self.nodeDesc.sourceCodeFolder if self.nodeDesc else ""
676671
self._internalFolderExp = "{cache}/{nodeType}/{uid}"
@@ -814,10 +809,6 @@ def getNodeInfo(self):
814809
info[key] = value
815810
return [{"key": k, "value": v} for k, v in info.items()]
816811

817-
@property
818-
def packageFullName(self):
819-
return '-'.join([self.packageName, self.packageVersion])
820-
821812
@Slot(str, result=Attribute)
822813
def attribute(self, name):
823814
att = None
@@ -1824,7 +1815,6 @@ def __init__(self, nodeType, position=None, parent=None, uid=None, **kwargs):
18241815
raise UnknownNodeTypeError(nodeType)
18251816

18261817
self.packageName = self.nodeDesc.packageName
1827-
self.packageVersion = self.nodeDesc.packageVersion
18281818

18291819
for attrDesc in self.nodeDesc.inputs:
18301820
self._attributes.add(attributeFactory(attrDesc, kwargs.get(attrDesc.name, None),

0 commit comments

Comments
 (0)