From adbdd3b99f539c77699a32fa138e479f3b275f10 Mon Sep 17 00:00:00 2001 From: Meir Arani Date: Thu, 17 Jul 2025 15:56:49 +0900 Subject: [PATCH 1/3] fixed local version semantics to match PyPA standards --- meshroom/__init__.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/meshroom/__init__.py b/meshroom/__init__.py index 9bb7315d71..c2e53d6c24 100644 --- a/meshroom/__init__.py +++ b/meshroom/__init__.py @@ -4,7 +4,6 @@ import os import sys - class VersionStatus(Enum): release = 1 develop = 2 @@ -15,7 +14,7 @@ class VersionStatus(Enum): __version_status__ = VersionStatus.develop if __version_status__ is VersionStatus.develop: - __version__ += "-" + __version_status__.name + __version__ += "+" + __version_status__.name __version_label__ = __version__ # Modify version label if we are in a development phase. @@ -31,7 +30,7 @@ class VersionStatus(Enum): __version_label__ += " branch=" + branchName else: # Add a generic default label "develop" - __version_label__ += "-" + __version_status__.name + __version_label__ += "+" + __version_status__.name # Allow override from env variable if "REZ_MESHROOM_VERSION" in os.environ: From 0b810f9b0d3d6443428b83c31b0818e63bc2e420 Mon Sep 17 00:00:00 2001 From: Fabien Castan Date: Tue, 23 Sep 2025 23:13:56 +0200 Subject: [PATCH 2/3] Removed redundant develop tag --- meshroom/__init__.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/meshroom/__init__.py b/meshroom/__init__.py index c2e53d6c24..287207f57f 100644 --- a/meshroom/__init__.py +++ b/meshroom/__init__.py @@ -28,9 +28,6 @@ class VersionStatus(Enum): data = headFile.readlines() branchName = data[0].split('/')[-1].strip() __version_label__ += " branch=" + branchName - else: - # Add a generic default label "develop" - __version_label__ += "+" + __version_status__.name # Allow override from env variable if "REZ_MESHROOM_VERSION" in os.environ: From f816c8eae01b4f9859d791e3df657e5dc754b952 Mon Sep 17 00:00:00 2001 From: Fabien Castan Date: Tue, 23 Sep 2025 23:08:25 +0200 Subject: [PATCH 3/3] Remove reference to ION --- meshroom/__init__.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/meshroom/__init__.py b/meshroom/__init__.py index 287207f57f..d487f22d67 100644 --- a/meshroom/__init__.py +++ b/meshroom/__init__.py @@ -32,8 +32,6 @@ class VersionStatus(Enum): # Allow override from env variable if "REZ_MESHROOM_VERSION" in os.environ: __version_label__ += " package=" + os.environ.get("REZ_MESHROOM_VERSION") - elif "ION_MESHROOM_VERSION" in os.environ: - __version_label__ += " container=" + os.environ.get("ION_MESHROOM_VERSION") # Internal imports after the definition of the version