Skip to content
Merged
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
8 changes: 1 addition & 7 deletions meshroom/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import os
import sys


class VersionStatus(Enum):
release = 1
develop = 2
Expand All @@ -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.
Expand All @@ -29,15 +28,10 @@ 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:
__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
Expand Down
Loading