From 8a36cf1d388efffbd039e6a6f03bc7394799fcf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Tue, 18 Oct 2022 10:57:13 +0200 Subject: [PATCH] Bumped version to 3.1 --- Makefile | 4 ++-- addon/flamenco/__init__.py | 2 +- 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 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index d53089df..381adca1 100644 --- a/Makefile +++ b/Makefile @@ -2,8 +2,8 @@ PKG := git.blender.org/flamenco # To update the version number in all the relevant places, update the VERSION # variable below and run `make update-version`. -VERSION := 3.1-alpha -RELEASE_CYCLE := alpha +VERSION := 3.1 +RELEASE_CYCLE := release # _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 cf61659a..c427065f 100644 --- a/addon/flamenco/__init__.py +++ b/addon/flamenco/__init__.py @@ -12,7 +12,7 @@ bl_info = { "doc_url": "https://flamenco.blender.org/", "category": "System", "support": "COMMUNITY", - "warning": "This is version 3.1-alpha of the add-on, which is not a stable release", + "warning": "", } from pathlib import Path diff --git a/addon/flamenco/manager/__init__.py b/addon/flamenco/manager/__init__.py index 903a93c0..5f555c10 100644 --- a/addon/flamenco/manager/__init__.py +++ b/addon/flamenco/manager/__init__.py @@ -10,7 +10,7 @@ """ -__version__ = "3.1-alpha" +__version__ = "3.1" # 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 3a9ad77d..7d411e21 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.1-alpha (Blender add-on)' + self.user_agent = 'Flamenco/3.1 (Blender add-on)' def __enter__(self): return self diff --git a/addon/flamenco/manager/configuration.py b/addon/flamenco/manager/configuration.py index 3a68ed65..953ffdac 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.1-alpha".\ + "SDK Package Version: 3.1".\ 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 49450d4f..eae10f95 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.1-alpha +- Package version: 3.1 - 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 aa6d4f0e..6205b6f9 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.1-alpha / webbrowser' + 'User-Agent': 'Flamenco/3.1 / webbrowser' }; /**