studio/flamenco
studio/flamenco
12
30
Fork 38
Code Issues 64 Pull Requests 5 Releases Wiki Activity

Sync branch magefile with main #104308

Merged
Sybren A. Stüvel merged 85 commits from abelli/flamenco:magefile into magefile 2024-05-13 16:26:32 +02:00
Conversation 0 Commits 85 Files Changed 145 +9 -9
7 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit bb772841b7 - Show all commits

4
Makefile
View File

@ -4,9 +4,9 @@ PKG := projects.blender.org/studio/flamenco
# To update the version number in all the relevant places, update the VERSION # To update the version number in all the relevant places, update the VERSION
# variable below and run `make update-version`. # variable below and run `make update-version`.
VERSION := 3.6-alpha0 VERSION := 3.5
# "alpha", "beta", or "release". # "alpha", "beta", or "release".
RELEASE_CYCLE := alpha RELEASE_CYCLE := release
# _GIT_DESCRIPTION_OR_TAG is either something like '16-123abc' (when we're 16 # _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 # commits since the last tag) or it's something like `v3.0-beta2` (when exactly

4
addon/flamenco/__init__.py
View File

@ -5,14 +5,14 @@
bl_info = { bl_info = {
"name": "Flamenco 3", "name": "Flamenco 3",
"author": "Sybren A. Stüvel", "author": "Sybren A. Stüvel",
"version": (3, 6), "version": (3, 5),
"blender": (3, 1, 0), "blender": (3, 1, 0),
"description": "Flamenco client for Blender.", "description": "Flamenco client for Blender.",
"location": "Output Properties > Flamenco", "location": "Output Properties > Flamenco",
"doc_url": "https://flamenco.blender.org/", "doc_url": "https://flamenco.blender.org/",
"category": "System", "category": "System",
"support": "COMMUNITY", "support": "COMMUNITY",
"warning": "This is version 3.6-alpha0 of the add-on, which is not a stable release", "warning": "",
} }
from pathlib import Path from pathlib import Path

2
addon/flamenco/manager/__init__.py generated
View File

@ -10,7 +10,7 @@
""" """
__version__ = "3.6-alpha0" __version__ = "3.5"
# import ApiClient # import ApiClient
from flamenco.manager.api_client import ApiClient from flamenco.manager.api_client import ApiClient

2
addon/flamenco/manager/api_client.py generated
View File

@ -76,7 +76,7 @@ class ApiClient(object):
self.default_headers[header_name] = header_value self.default_headers[header_name] = header_value
self.cookie = cookie self.cookie = cookie
# Set default User-Agent. # Set default User-Agent.
self.user_agent = 'Flamenco/3.6-alpha0 (Blender add-on)' self.user_agent = 'Flamenco/3.5 (Blender add-on)'
def __enter__(self): def __enter__(self):
return self return self

2
addon/flamenco/manager/configuration.py generated
View File

@ -404,7 +404,7 @@ conf = flamenco.manager.Configuration(
"OS: {env}\n"\ "OS: {env}\n"\
"Python Version: {pyversion}\n"\ "Python Version: {pyversion}\n"\
"Version of the API: 1.0.0\n"\ "Version of the API: 1.0.0\n"\
"SDK Package Version: 3.6-alpha0".\ "SDK Package Version: 3.5".\
format(env=sys.platform, pyversion=sys.version) format(env=sys.platform, pyversion=sys.version)
def get_host_settings(self): def get_host_settings(self):

2
addon/flamenco/manager_README.md generated
View File

@ -4,7 +4,7 @@ Render Farm manager API
The `flamenco.manager` package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project: The `flamenco.manager` package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
- API version: 1.0.0 - API version: 1.0.0
- Package version: 3.6-alpha0 - Package version: 3.5
- Build package: org.openapitools.codegen.languages.PythonClientCodegen - Build package: org.openapitools.codegen.languages.PythonClientCodegen
For more information, please visit [https://flamenco.io/](https://flamenco.io/) For more information, please visit [https://flamenco.io/](https://flamenco.io/)

2
web/app/src/manager-api/ApiClient.js generated
View File

@ -55,7 +55,7 @@ class ApiClient {
* @default {} * @default {}
*/ */
this.defaultHeaders = { this.defaultHeaders = {
'User-Agent': 'Flamenco/3.6-alpha0 / webbrowser' 'User-Agent': 'Flamenco/3.5 / webbrowser'
}; };
/** /**