From 940f814fcc0c34644222b4650be507c34497f8df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= <sybren@blender.org>
Date: Sun, 1 Dec 2024 14:54:15 +0100
Subject: [PATCH] Bumped version to 3.6

---
 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 +-
 magefiles/version.go                    | 4 ++--
 web/app/src/manager-api/ApiClient.js    | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 21f8eba8..822b459e 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.6-alpha5
+VERSION := 3.6
 # "alpha", "beta", or "release".
-RELEASE_CYCLE := alpha
+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 5ca13b91..ee50cc99 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.6-alpha5 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 fa51eb09..12fe77c9 100644
--- a/addon/flamenco/manager/__init__.py
+++ b/addon/flamenco/manager/__init__.py
@@ -10,7 +10,7 @@
 """
 
 
-__version__ = "3.6-alpha5"
+__version__ = "3.6"
 
 # 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 648ddbd2..25f1731b 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.6-alpha5 (Blender add-on)'
+        self.user_agent = 'Flamenco/3.6 (Blender add-on)'
 
     def __enter__(self):
         return self
diff --git a/addon/flamenco/manager/configuration.py b/addon/flamenco/manager/configuration.py
index d86732dc..9b62ad6b 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.6-alpha5".\
+               "SDK Package Version: 3.6".\
                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 d5bb20c9..41aadfac 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.6-alpha5
+- Package version: 3.6
 - Build package: org.openapitools.codegen.languages.PythonClientCodegen
 For more information, please visit [https://flamenco.blender.org/](https://flamenco.blender.org/)
 
diff --git a/magefiles/version.go b/magefiles/version.go
index ff5ef66e..35620385 100644
--- a/magefiles/version.go
+++ b/magefiles/version.go
@@ -11,8 +11,8 @@ import (
 // To update the version number in all the relevant places, update the VERSION
 // variable below and run `mage update-version`.
 const (
-	version      = "3.6-alpha5"
-	releaseCycle = "alpha"
+	version      = "3.6"
+	releaseCycle = "release"
 )
 
 func gitHash() (string, error) {
diff --git a/web/app/src/manager-api/ApiClient.js b/web/app/src/manager-api/ApiClient.js
index b6397c95..26091273 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.6-alpha5 / webbrowser'
+            'User-Agent': 'Flamenco/3.6 / webbrowser'
         };
 
         /**