Skip to content

Commit

Permalink
Fix error with addon version format
Browse files Browse the repository at this point in the history
  • Loading branch information
hlorus committed Apr 21, 2024
1 parent a11d8bb commit f297800
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 7 deletions.
17 changes: 13 additions & 4 deletions utilities/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,28 @@ def get_bl_info():
return bl_info


def get_addon_version() -> str:
"""Return addon version from manifest file"""
def get_addon_version_tuple() -> tuple:
"""Return addon version as a tuple e.g. (0, 27, 1)"""

if version < (4, 20):
return str(get_bl_info()["version"])
return get_bl_info()["version"]

manifest = pathlib.Path(__file__).parent.parent / "blender_manifest.toml"
try:
import toml
return toml.load(manifest)["blender"]
version_tuple = toml.load(manifest)["version"]
return tuple(map(int, version_tuple.split(".")))
except Exception:
return ""


def get_addon_version() -> str:
"""Return addon version as string"""

version = get_addon_version_tuple()
return ".".join(map(str, version))


def get_min_blender_version() -> str:
"""Returns the minimal required blender version from manifest file"""

Expand Down
6 changes: 3 additions & 3 deletions versioning.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import bpy
import logging
from .utilities import get_addon_version
from .utilities import get_addon_version_tuple

logger = logging.getLogger(__name__)


def write_addon_version(context):
version = get_addon_version()
version = get_addon_version_tuple()

logger.debug("Writing addon version: " + str(version))

Expand Down Expand Up @@ -46,7 +46,7 @@ def do_versioning(self):
# blender version this file was saved with
file_version = bpy.data.version
# Current addon version
current_addon_version = get_addon_version()
current_addon_version = get_addon_version_tuple()
# "Blender Version: ", current_version,
# "\nFile Blender Version: ", file_version,
# "\nAddon Version: ", current_addon_version,
Expand Down

0 comments on commit f297800

Please sign in to comment.