From f7a4e16d0347608eadd7f6a9e56bca552328b4d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomek=20W=C3=B3jcik?= Date: Wed, 20 Aug 2025 21:37:31 +0200 Subject: [PATCH 1/2] BTHLABS-0000: Code cleanup ;) --- services/backend/setup.cfg | 2 +- services/backend/tasks.py | 2 +- services/packages/setup.cfg | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/services/backend/setup.cfg b/services/backend/setup.cfg index 3478fc4..be273a0 100644 --- a/services/backend/setup.cfg +++ b/services/backend/setup.cfg @@ -13,7 +13,7 @@ addopts = --disable-warnings django_debug_mode = keep [isort] -known_first_party=hotpocket_backend,hotpocket_backend_testing,hotpocket_common,hotpocket_soa,hotpocket_testing +known_first_party=hotpocket_backend,hotpocket_backend_testing,hotpocket_common,hotpocket_soa,hotpocket_testing,hotpocket_workspace_tools multi_line_output=3 include_trailing_comma=true force_sort_within_sections=true diff --git a/services/backend/tasks.py b/services/backend/tasks.py index ef94d90..79ec39b 100644 --- a/services/backend/tasks.py +++ b/services/backend/tasks.py @@ -9,7 +9,7 @@ import os from invoke import task from invoke.exceptions import UnexpectedExit -from hotpocket_workspace_tools import get_workspace_mode, WorkspaceMode +from hotpocket_workspace_tools import WorkspaceMode, get_workspace_mode WORKSPACE_MODE = get_workspace_mode() ENV = os.getenv('HOTPOCKET_BACKEND_ENV', 'docker') diff --git a/services/packages/setup.cfg b/services/packages/setup.cfg index c6b1153..524deaa 100644 --- a/services/packages/setup.cfg +++ b/services/packages/setup.cfg @@ -7,7 +7,7 @@ max-line-length = 119 hang-closing = False [isort] -known_first_party=hotpocket_backend,hotpocket_backend_testing,hotpocket_common,hotpocket_soa,hotpocket_testing +known_first_party=hotpocket_backend,hotpocket_backend_testing,hotpocket_common,hotpocket_soa,hotpocket_testing,hotpocket_workspace_tools multi_line_output=3 include_trailing_comma=true force_sort_within_sections=true From f04c243470f63df4aa81784acec1205ad5999b1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomek=20W=C3=B3jcik?= Date: Wed, 20 Aug 2025 21:57:41 +0200 Subject: [PATCH 2/2] Release v1.0.1 --- README.md | 2 +- deployment/aio/docker-compose.yaml | 2 +- deployment/fullstack/docker-compose.yaml | 8 ++++---- services/backend/hotpocket_backend/_meta.py | 2 +- services/backend/ops/bin/entrypoint-deployment.sh | 2 +- services/backend/package.json | 2 +- services/backend/pyproject.toml | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 23262a4..b60c636 100644 --- a/README.md +++ b/README.md @@ -66,7 +66,7 @@ $ docker run --rm -it \ -e HOTPOCKET_BACKEND_INITIAL_ACCOUNT_USERNAME=hotpocket \ -e HOTPOCKET_BACKEND_INITIAL_ACCOUNT_PASSWORD=hotpocketm4st3r \ -p 8000:8000 \ - docker-hosted.nexus.bthlabs.pl/hotpocket/backend:aio-v1.0.0-01 + docker-hosted.nexus.bthlabs.pl/hotpocket/backend:aio-v1.0.1-01 ``` The command above will set up and start the application. The SQLite file will diff --git a/deployment/aio/docker-compose.yaml b/deployment/aio/docker-compose.yaml index a7bc654..fb59c95 100644 --- a/deployment/aio/docker-compose.yaml +++ b/deployment/aio/docker-compose.yaml @@ -1,6 +1,6 @@ services: backend: - image: "docker-hosted.nexus.bthlabs.pl/hotpocket/backend:aio-v1.0.0-01" + image: "docker-hosted.nexus.bthlabs.pl/hotpocket/backend:aio-v1.0.1-01" environment: HOTPOCKET_BACKEND_SECRET_KEY: "thisisntright" HOTPOCKET_BACKEND_INITIAL_ACCOUNT_USERNAME: "hotpocket" diff --git a/deployment/fullstack/docker-compose.yaml b/deployment/fullstack/docker-compose.yaml index 91adbde..7c1edd3 100644 --- a/deployment/fullstack/docker-compose.yaml +++ b/deployment/fullstack/docker-compose.yaml @@ -8,7 +8,7 @@ x-backend-environment: &x-backend-environment services: webapp: - image: "docker-hosted.nexus.bthlabs.pl/hotpocket/backend:deployment-v1.0.0-01" + image: "docker-hosted.nexus.bthlabs.pl/hotpocket/backend:deployment-v1.0.1-01" environment: <<: *x-backend-environment HOTPOCKET_BACKEND_ALLOWED_HOSTS: "app.staging.hotpocket.bthlab.bthlabs.net" @@ -21,7 +21,7 @@ services: restart: "unless-stopped" admin: - image: "docker-hosted.nexus.bthlabs.pl/hotpocket/backend:deployment-v1.0.0-01" + image: "docker-hosted.nexus.bthlabs.pl/hotpocket/backend:deployment-v1.0.1-01" environment: <<: *x-backend-environment HOTPOCKET_BACKEND_APP: "admin" @@ -35,7 +35,7 @@ services: restart: "unless-stopped" celery-worker: - image: "docker-hosted.nexus.bthlabs.pl/hotpocket/backend:deployment-v1.0.0-01" + image: "docker-hosted.nexus.bthlabs.pl/hotpocket/backend:deployment-v1.0.1-01" command: - "/srv/venv/bin/celery" - "-A" @@ -57,7 +57,7 @@ services: restart: "unless-stopped" celery-beat: - image: "docker-hosted.nexus.bthlabs.pl/hotpocket/backend:deployment-v1.0.0-01" + image: "docker-hosted.nexus.bthlabs.pl/hotpocket/backend:deployment-v1.0.1-01" command: - "/srv/venv/bin/celery" - "-A" diff --git a/services/backend/hotpocket_backend/_meta.py b/services/backend/hotpocket_backend/_meta.py index 442144d..0dd542e 100644 --- a/services/backend/hotpocket_backend/_meta.py +++ b/services/backend/hotpocket_backend/_meta.py @@ -1,4 +1,4 @@ # -*- coding: utf-8 -*- from __future__ import annotations -version = '1.0.0' +version = '1.0.1' diff --git a/services/backend/ops/bin/entrypoint-deployment.sh b/services/backend/ops/bin/entrypoint-deployment.sh index 16961d0..601e495 100755 --- a/services/backend/ops/bin/entrypoint-deployment.sh +++ b/services/backend/ops/bin/entrypoint-deployment.sh @@ -13,7 +13,7 @@ cat <"] license = "Apache-2.0"