From 8deb438a8e806e4d1cdcb9df564370f45866bd4b Mon Sep 17 00:00:00 2001 From: vanous Date: Sat, 25 Nov 2023 23:00:44 +0100 Subject: [PATCH] Release v1.0.3 --- CHANGELOG.md | 27 +++++++++++++++++++++++++++ README.md | 4 ++-- __init__.py | 2 +- scripts/build_release.py | 27 +++++++++++++++++++++++++-- 4 files changed, 55 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f4e91ca9..69d57836 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,32 @@ ### Changelog +### 1.0.3 + +* MVR Improvements: + * Add FixtureID, CustomId... from MVR to Fixture + * Create groups from MVR, migrate groups from str([]) to json + * Clean up unused MVR collections after MVR import + * Add UUID to fixtures and groups + +* GDTF Improvements: + * Handle models composed of multiple parts + +* App improvements: + * Add initial support for 2D symbols and 2D TOP planning view + * Speed up MVR import - fix GDTF collection caching, cache also MVR imported objects + * Converted Primitives to glb to ensure compatibility with Blender 4.x + * Increment data version and provide migration + * Remove fixture from groups when deleting fixture + * Display revision in fixture listing + * Create new World in case it is missing + * Allow centering selected fixture's Targets + * Handle time during fixture edit processing (prevent errors) + * Check for existence of Dimmer for fixtures without dimmer (prevent errors) + * Add possibility to make fixture geometries selectable + * Display Volume cone on all lights when enabled + * Add generix XYZ fixture to BlenderDMX + * Add support for XYZ Z,Y,Z a nd Rot X,Y,Z attributes and for devices without target + ### 1.0.2 * MVR improvements: * Add collections for GroupObjects and Layers diff --git a/README.md b/README.md index 4653c5b7..fbb2299b 100644 --- a/README.md +++ b/README.md @@ -13,9 +13,9 @@ A DMX visualization tool inside Blender, desig First of all, make sure you have installed [Blender 3.0](https://www.blender.org/download/) or higher; Then, download the `zip` file: -### LATEST RELEASE (STABLE): v1.0.2 +### LATEST RELEASE (STABLE): v1.0.3 - 1. From the [latest release](https://github.com/open-stage/blender-dmx/releases/latest) download the [blenderDMX_v1.0.2.zip](https://github.com/open-stage/blender-dmx/releases/download/v1.0.2/blenderDMX_v1.0.2.zip) file + 1. From the [latest release](https://github.com/open-stage/blender-dmx/releases/latest) download the [blenderDMX_v1.0.3.zip](https://github.com/open-stage/blender-dmx/releases/download/v1.0.2/blenderDMX_v1.0.3.zip) file ### ROLLING RELEASE (UNSTABLE) diff --git a/__init__.py b/__init__.py index e91aa816..c84e89e3 100644 --- a/__init__.py +++ b/__init__.py @@ -2,7 +2,7 @@ "name": "DMX", "description": "DMX visualization and programming, with GDTF/MVR and Network support", "author": "open-stage", - "version": (1, 0, 2), + "version": (1, 0, 3), "blender": (3, 0, 0), "location": "3D View > DMX", "wiki_url": "https://github.com/open-stage/blender-dmx/wiki", diff --git a/scripts/build_release.py b/scripts/build_release.py index 01cedd8e..ffa890d1 100644 --- a/scripts/build_release.py +++ b/scripts/build_release.py @@ -3,14 +3,31 @@ import shutil from shutil import copytree, ignore_patterns from pygit2 import Repository +import sys BUILD_DIR = "build" +def read_version(): + line = "" + with open("__init__.py", "r") as f: + while True: + line += f.readline().rstrip() + if "}" in line: + break + version_string = line.replace("bl_info = ","") + bl_info=eval(version_string) + x,y,z = bl_info["version"] + return f"{x}.{y}.{z}" + + branch_name = Repository(".").head.shorthand if branch_name == None: raise Exception("Run the script from the project root.") -print("branch name", branch_name) -branch_name = "release_v1.0.2" + +set_version = read_version() +#branch_name = "release_v1.0.3" +branch_version = branch_name[9:] + release_name = branch_name if re.match(r"^release_v\d+\.\d+\.\d+$", branch_name): @@ -19,6 +36,11 @@ ) release_name = branch_name[8:] + +if set_version != branch_version: + print(f"Branch version {branch_version} and add-on version {set_version} do not match. Exit!") + sys.exit() + zip_name = "blenderDMX_" + release_name print("---------") @@ -54,6 +76,7 @@ print("Copying metadata to build directory...") shutil.copy2("CHANGELOG.md", BUILD_DIR + "/dmx") shutil.copy2("LICENSE", BUILD_DIR + "/dmx") +shutil.copy2("README.md", BUILD_DIR + "/dmx") print("Zipping release...") shutil.make_archive(zip_name, "zip", BUILD_DIR)