From b367c1f7ee999e504c91bdffea79420e3b36f6b5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 8 Mar 2023 20:09:34 +0000 Subject: [PATCH 1/5] chore(deps): update pre-commit hook codespell-project/codespell to v2.2.4 --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 8f0ea2bf7..7546c4d79 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -47,7 +47,7 @@ repos: - id: black - repo: https://github.com/codespell-project/codespell - rev: v2.2.2 + rev: v2.2.4 hooks: - id: codespell args: [--ignore-words=.codespellignore] From 5aac4eb3a988f6b614bb9f335805fb94aa9da0df Mon Sep 17 00:00:00 2001 From: Kyle Robbertze Date: Tue, 14 Mar 2023 08:47:18 +0000 Subject: [PATCH 2/5] ci: allow Falso as a word in codespell --- .codespellignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.codespellignore b/.codespellignore index d71f78f01..b455798e9 100644 --- a/.codespellignore +++ b/.codespellignore @@ -5,6 +5,7 @@ ro # Names flor +falso # TODO: See https://github.com/savonet/liquidsoap/issues/1654 prefered From af4f8fe02df751cb4e71f8fcf1c2bdebee8b80d0 Mon Sep 17 00:00:00 2001 From: jo Date: Wed, 15 Mar 2023 17:14:51 +0100 Subject: [PATCH 3/5] chore: rename branch 3.0.x to stable --- .github/renovate.json | 2 +- .github/workflows/analyzer.yml | 4 ++-- .github/workflows/api-client.yml | 4 ++-- .github/workflows/api.yml | 4 ++-- .github/workflows/container.yml | 4 ++-- .github/workflows/docs.yml | 4 ++-- .github/workflows/legacy.yml | 4 ++-- .github/workflows/playout.yml | 4 ++-- .github/workflows/project.yml | 4 ++-- .github/workflows/shared.yml | 4 ++-- .github/workflows/worker.yml | 4 ++-- 11 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/renovate.json b/.github/renovate.json index 5e4ea9f9a..f0a45cdc0 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -8,7 +8,7 @@ "branchTopic": "lock-file-maintenance-{{packageFile}}", "schedule": ["after 4am and before 5am on monday"] }, - "baseBranches": ["main", "3.0.x"], + "baseBranches": ["main", "stable"], "labels": ["dependencies"], "packageRules": [ { diff --git a/.github/workflows/analyzer.yml b/.github/workflows/analyzer.yml index d8048ed6d..ba8dfafc7 100644 --- a/.github/workflows/analyzer.yml +++ b/.github/workflows/analyzer.yml @@ -2,7 +2,7 @@ name: Analyzer on: push: - branches: [main, 3.0.x] + branches: [main, stable] paths: - .github/workflows/_python.yml - .github/workflows/analyzer.yml @@ -10,7 +10,7 @@ on: - shared/** pull_request: - branches: [main, 3.0.x] + branches: [main, stable] paths: - .github/workflows/_python.yml - .github/workflows/analyzer.yml diff --git a/.github/workflows/api-client.yml b/.github/workflows/api-client.yml index e10c41ef9..803b3c361 100644 --- a/.github/workflows/api-client.yml +++ b/.github/workflows/api-client.yml @@ -2,7 +2,7 @@ name: API Client on: push: - branches: [main, 3.0.x] + branches: [main, stable] paths: - .github/workflows/_python.yml - .github/workflows/api-client.yml @@ -10,7 +10,7 @@ on: - shared/** pull_request: - branches: [main, 3.0.x] + branches: [main, stable] paths: - .github/workflows/_python.yml - .github/workflows/api-client.yml diff --git a/.github/workflows/api.yml b/.github/workflows/api.yml index f1b5a2408..664887f83 100644 --- a/.github/workflows/api.yml +++ b/.github/workflows/api.yml @@ -2,7 +2,7 @@ name: API on: push: - branches: [main, 3.0.x] + branches: [main, stable] paths: - .github/workflows/_python.yml - .github/workflows/api.yml @@ -10,7 +10,7 @@ on: - shared/** pull_request: - branches: [main, 3.0.x] + branches: [main, stable] paths: - .github/workflows/_python.yml - .github/workflows/api.yml diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml index 989d3e375..e20734383 100644 --- a/.github/workflows/container.yml +++ b/.github/workflows/container.yml @@ -3,9 +3,9 @@ name: Container on: push: tags: ["[0-9]+.[0-9]+.[0-9]+*"] - branches: [main, 3.0.x] + branches: [main, stable] pull_request: - branches: [main, 3.0.x] + branches: [main, stable] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 151d1feae..c4c92bd14 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -2,14 +2,14 @@ name: Docs on: push: - branches: [main, 3.0.x] + branches: [main, stable] paths: - .github/vale/** - .github/workflows/docs.yml - docs/** pull_request: - branches: [main, 3.0.x] + branches: [main, stable] paths: - .github/vale/** - .github/workflows/docs.yml diff --git a/.github/workflows/legacy.yml b/.github/workflows/legacy.yml index 2a4f9f55d..5c3966dab 100644 --- a/.github/workflows/legacy.yml +++ b/.github/workflows/legacy.yml @@ -2,14 +2,14 @@ name: Legacy on: push: - branches: [main, 3.0.x] + branches: [main, stable] paths: - .github/workflows/legacy.yml - api/** - legacy/** pull_request: - branches: [main, 3.0.x] + branches: [main, stable] paths: - .github/workflows/legacy.yml - api/** diff --git a/.github/workflows/playout.yml b/.github/workflows/playout.yml index c7241cbf1..965e6b15f 100644 --- a/.github/workflows/playout.yml +++ b/.github/workflows/playout.yml @@ -2,7 +2,7 @@ name: Playout on: push: - branches: [main, 3.0.x] + branches: [main, stable] paths: - .github/workflows/_python.yml - .github/workflows/playout.yml @@ -11,7 +11,7 @@ on: - shared/** pull_request: - branches: [main, 3.0.x] + branches: [main, stable] paths: - .github/workflows/_python.yml - .github/workflows/playout.yml diff --git a/.github/workflows/project.yml b/.github/workflows/project.yml index a1e227099..cdcb612d7 100644 --- a/.github/workflows/project.yml +++ b/.github/workflows/project.yml @@ -2,10 +2,10 @@ name: Project on: push: - branches: [main, 3.0.x] + branches: [main, stable] pull_request: types: [opened, reopened, synchronize, edited] - branches: [main, 3.0.x] + branches: [main, stable] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/shared.yml b/.github/workflows/shared.yml index 2002757da..ac70404c9 100644 --- a/.github/workflows/shared.yml +++ b/.github/workflows/shared.yml @@ -2,14 +2,14 @@ name: Shared on: push: - branches: [main, 3.0.x] + branches: [main, stable] paths: - .github/workflows/_python.yml - .github/workflows/shared.yml - shared/** pull_request: - branches: [main, 3.0.x] + branches: [main, stable] paths: - .github/workflows/_python.yml - .github/workflows/shared.yml diff --git a/.github/workflows/worker.yml b/.github/workflows/worker.yml index b378b95e2..3a290ec8c 100644 --- a/.github/workflows/worker.yml +++ b/.github/workflows/worker.yml @@ -2,14 +2,14 @@ name: Worker on: push: - branches: [main, 3.0.x] + branches: [main, stable] paths: - .github/workflows/_python.yml - .github/workflows/worker.yml - worker/** pull_request: - branches: [main, 3.0.x] + branches: [main, stable] paths: - .github/workflows/_python.yml - .github/workflows/worker.yml From 1f48e384118297af82b3f32f7e085be3c64a2b88 Mon Sep 17 00:00:00 2001 From: jo Date: Tue, 14 Mar 2023 11:49:44 +0100 Subject: [PATCH 4/5] test(api): fix linting errors --- api/libretime_api/core/models/preference.py | 2 +- api/libretime_api/settings/prod.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/libretime_api/core/models/preference.py b/api/libretime_api/core/models/preference.py index d535c3a17..4057ef2a2 100644 --- a/api/libretime_api/core/models/preference.py +++ b/api/libretime_api/core/models/preference.py @@ -78,7 +78,7 @@ class Preference(models.Model): entries = dict(cls.site.values_list("key", "value")) return StreamPreferences( input_fade_transition=float(entries.get("default_transition_fade") or 0.0), - message_format=int(entries.get("stream_label_format") or 0), + message_format=MessageFormatKind(entries.get("stream_label_format") or 0), message_offline=entries.get("off_air_meta") or "Offline", ) diff --git a/api/libretime_api/settings/prod.py b/api/libretime_api/settings/prod.py index 25312db67..03aa1572d 100644 --- a/api/libretime_api/settings/prod.py +++ b/api/libretime_api/settings/prod.py @@ -22,7 +22,7 @@ from ._schema import Config LIBRETIME_LOG_FILEPATH = getenv("LIBRETIME_LOG_FILEPATH") LIBRETIME_CONFIG_FILEPATH = getenv("LIBRETIME_CONFIG_FILEPATH") -CONFIG = Config(LIBRETIME_CONFIG_FILEPATH) +CONFIG = Config(LIBRETIME_CONFIG_FILEPATH) # type: ignore[arg-type, misc] SECRET_KEY = CONFIG.general.api_key From deec2a17265420130d5ee08c7554660d4098380d Mon Sep 17 00:00:00 2001 From: jo Date: Tue, 14 Mar 2023 11:56:18 +0100 Subject: [PATCH 5/5] test(shared): fix linting errors --- shared/libretime_shared/config/_models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared/libretime_shared/config/_models.py b/shared/libretime_shared/config/_models.py index 79929a12e..70aa435e2 100644 --- a/shared/libretime_shared/config/_models.py +++ b/shared/libretime_shared/config/_models.py @@ -270,4 +270,4 @@ class StreamConfig(BaseModel): """Stream configuration model.""" inputs: Inputs = Inputs() - outputs: Outputs = Outputs() + outputs: Outputs = Outputs() # type: ignore[call-arg]