From 02011f8237e6ff816455a56140441269f5b6f2ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Mon, 6 Nov 2023 15:08:17 +0100 Subject: [PATCH] Bumped version to 3.4-alpha0 --- CHANGELOG.md | 2 ++ Makefile | 4 ++-- addon/flamenco/__init__.py | 4 ++-- addon/flamenco/manager/__init__.py | 2 +- addon/flamenco/manager/api_client.py | 2 +- addon/flamenco/manager/configuration.py | 2 +- addon/flamenco/manager_README.md | 2 +- web/app/src/manager-api/ApiClient.js | 2 +- 8 files changed, 11 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1b5c0684..395de698 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ This file contains the history of changes to Flamenco. Only changes that might be interesting for users are listed here, such as new features and fixes for bugs in actually-released versions. +## 3.4 - in development + ## 3.3 - released 2023-11-06 - Add Worker Tag support. Workers can be members of any number of tags. Workers will only work on jobs that are assigned to that tag. Jobs that do not have a tag will be available to all workers, regardless of their tag assignment. As a result, tagless workers will only work on tagless jobs. diff --git a/Makefile b/Makefile index 8febe9e1..bc079b08 100644 --- a/Makefile +++ b/Makefile @@ -4,9 +4,9 @@ PKG := projects.blender.org/studio/flamenco # To update the version number in all the relevant places, update the VERSION # variable below and run `make update-version`. -VERSION := 3.3 +VERSION := 3.4-alpha0 # "alpha", "beta", or "release". -RELEASE_CYCLE := release +RELEASE_CYCLE := alpha # _GIT_DESCRIPTION_OR_TAG is either something like '16-123abc' (when we're 16 # commits since the last tag) or it's something like `v3.0-beta2` (when exactly diff --git a/addon/flamenco/__init__.py b/addon/flamenco/__init__.py index 230771a1..bcecda41 100644 --- a/addon/flamenco/__init__.py +++ b/addon/flamenco/__init__.py @@ -5,14 +5,14 @@ bl_info = { "name": "Flamenco 3", "author": "Sybren A. Stüvel", - "version": (3, 3), + "version": (3, 4), "blender": (3, 1, 0), "description": "Flamenco client for Blender.", "location": "Output Properties > Flamenco", "doc_url": "https://flamenco.blender.org/", "category": "System", "support": "COMMUNITY", - "warning": "", + "warning": "This is version 3.4-alpha0 of the add-on, which is not a stable release", } from pathlib import Path diff --git a/addon/flamenco/manager/__init__.py b/addon/flamenco/manager/__init__.py index ac249ebb..8df0e719 100644 --- a/addon/flamenco/manager/__init__.py +++ b/addon/flamenco/manager/__init__.py @@ -10,7 +10,7 @@ """ -__version__ = "3.3" +__version__ = "3.4-alpha0" # import ApiClient from flamenco.manager.api_client import ApiClient diff --git a/addon/flamenco/manager/api_client.py b/addon/flamenco/manager/api_client.py index d0013a32..153c0074 100644 --- a/addon/flamenco/manager/api_client.py +++ b/addon/flamenco/manager/api_client.py @@ -76,7 +76,7 @@ class ApiClient(object): self.default_headers[header_name] = header_value self.cookie = cookie # Set default User-Agent. - self.user_agent = 'Flamenco/3.3 (Blender add-on)' + self.user_agent = 'Flamenco/3.4-alpha0 (Blender add-on)' def __enter__(self): return self diff --git a/addon/flamenco/manager/configuration.py b/addon/flamenco/manager/configuration.py index 9f5c4c46..7a515d36 100644 --- a/addon/flamenco/manager/configuration.py +++ b/addon/flamenco/manager/configuration.py @@ -404,7 +404,7 @@ conf = flamenco.manager.Configuration( "OS: {env}\n"\ "Python Version: {pyversion}\n"\ "Version of the API: 1.0.0\n"\ - "SDK Package Version: 3.3".\ + "SDK Package Version: 3.4-alpha0".\ format(env=sys.platform, pyversion=sys.version) def get_host_settings(self): diff --git a/addon/flamenco/manager_README.md b/addon/flamenco/manager_README.md index 5e7f41a5..445891c2 100644 --- a/addon/flamenco/manager_README.md +++ b/addon/flamenco/manager_README.md @@ -4,7 +4,7 @@ Render Farm manager API The `flamenco.manager` package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project: - API version: 1.0.0 -- Package version: 3.3 +- Package version: 3.4-alpha0 - Build package: org.openapitools.codegen.languages.PythonClientCodegen For more information, please visit [https://flamenco.io/](https://flamenco.io/) diff --git a/web/app/src/manager-api/ApiClient.js b/web/app/src/manager-api/ApiClient.js index d01f198a..19e81062 100644 --- a/web/app/src/manager-api/ApiClient.js +++ b/web/app/src/manager-api/ApiClient.js @@ -55,7 +55,7 @@ class ApiClient { * @default {} */ this.defaultHeaders = { - 'User-Agent': 'Flamenco/3.3 / webbrowser' + 'User-Agent': 'Flamenco/3.4-alpha0 / webbrowser' }; /**