From 7454427a76b114390dc00f15630db957dd2f9837 Mon Sep 17 00:00:00 2001 From: cmdoret Date: Fri, 22 Aug 2025 16:35:17 +0200 Subject: [PATCH 1/6] chore: bump version to 0.3.3 --- docs/conf.py | 2 +- src/modos/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 61693bad..17393590 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -9,7 +9,7 @@ project = "modos-api" copyright = "2024, sdsc-ordes" author = "sdsc-ordes" -release = "0.3.2" +release = "0.3.3" # -- General configuration --------------------------------------------------- # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration diff --git a/src/modos/__init__.py b/src/modos/__init__.py index f9aa3e11..e19434e2 100644 --- a/src/modos/__init__.py +++ b/src/modos/__init__.py @@ -1 +1 @@ -__version__ = "0.3.2" +__version__ = "0.3.3" From 1ebb007f77f9bb6f1208330876450f21a4b5361c Mon Sep 17 00:00:00 2001 From: cmdoret Date: Fri, 22 Aug 2025 16:36:57 +0200 Subject: [PATCH 2/6] chore: update changelog --- CHANGELOG.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5fdb9c45..ddbdd49f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ Notable changes introduced in modos releases are documented in this file +## [0.3.3] - 2025-08-22 + +### Bug Fixes + +- _(deploy)_ drop depends_on.required for compat with older compose (#156) +- _(deploy)_ nonroot container users (#157) +- _(deploy)_ addgroup -> groupadd for debian-based images + +### Features + +- _(deploy)_ caddy with https support (#160)- compatibility with air-gapped + deployments (#154) + ## [0.3.2] - 2025-06-16 ### Bug Fixes From 8750af251091cac9cce14e4c19d451e4411ac902 Mon Sep 17 00:00:00 2001 From: cmdoret Date: Fri, 22 Aug 2025 16:58:42 +0200 Subject: [PATCH 3/6] fix(just): limite concurrent uv builds --- justfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/justfile b/justfile index fe41e880..e717d20e 100644 --- a/justfile +++ b/justfile @@ -32,7 +32,7 @@ develop: # Set up python environment. setup: @echo "🔧 Setting up python environment" - uv sync --all-extras --group dev + UV_CONCURRENT_BUILDS=1 uv sync --all-extras --group dev uv run pre-commit install From 8e26c0d4b260e7c1dfb7d25c6823861b35312f1a Mon Sep 17 00:00:00 2001 From: cmdoret Date: Mon, 25 Aug 2025 15:35:36 +0200 Subject: [PATCH 4/6] chore(debug): disable pre-commit --- justfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/justfile b/justfile index e717d20e..c55ca3ba 100644 --- a/justfile +++ b/justfile @@ -33,7 +33,7 @@ develop: setup: @echo "🔧 Setting up python environment" UV_CONCURRENT_BUILDS=1 uv sync --all-extras --group dev - uv run pre-commit install + #uv run pre-commit install # Run all quality checks. From ab87cb1a7c1fd587ce0fb50204e05a6a76447153 Mon Sep 17 00:00:00 2001 From: cmdoret Date: Mon, 25 Aug 2025 15:40:49 +0200 Subject: [PATCH 5/6] chore(debug): disable pre-commit --- justfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/justfile b/justfile index c55ca3ba..ced6acc6 100644 --- a/justfile +++ b/justfile @@ -32,7 +32,7 @@ develop: # Set up python environment. setup: @echo "🔧 Setting up python environment" - UV_CONCURRENT_BUILDS=1 uv sync --all-extras --group dev + #UV_CONCURRENT_BUILDS=1 uv sync --all-extras --group dev #uv run pre-commit install From c33a221aa4add631b1b37bdaaa37107224e0cc67 Mon Sep 17 00:00:00 2001 From: cmdoret Date: Mon, 25 Aug 2025 16:39:26 +0200 Subject: [PATCH 6/6] fix(just): avoid recipe recursion --- justfile | 13 +++---------- tools/just/image.just | 21 +++++++++++++-------- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/justfile b/justfile index ced6acc6..98ad9975 100644 --- a/justfile +++ b/justfile @@ -16,15 +16,8 @@ host := `ip route get 1 | sed -En 's/^.*src ([0-9.]*) .*$/\1/p'` default: just --unsorted --list --no-aliases -# Get package version. -[private] -get-version: - #!/usr/bin/env bash - grep -E '^__version__ += +' src/modos/__init__.py \ - | sed -E 's/.*= +//' \ - | tr -d '"' - alias dev := develop + # Enter a development shell. develop: just nix::develop default @@ -32,8 +25,8 @@ develop: # Set up python environment. setup: @echo "🔧 Setting up python environment" - #UV_CONCURRENT_BUILDS=1 uv sync --all-extras --group dev - #uv run pre-commit install + uv sync --all-extras --group dev + uv run pre-commit install # Run all quality checks. diff --git a/tools/just/image.just b/tools/just/image.just index cc795fe7..c16f5dad 100644 --- a/tools/just/image.just +++ b/tools/just/image.just @@ -4,23 +4,28 @@ set shell := ["bash", "-cue"] root_dir := `git rev-parse --show-toplevel` registry := "ghcr.io/sdsc-ordes" repository := "modos-api" -tag := `just get-version` ctr := "docker" +tag_cmd := ( + "grep -E '^__version__ += +' " + + root_dir + + "/src/modos/__init__.py | sed -E 's/.*= +//' | tr -d '\"'" +) + [private] default: just --unsorted --no-aliases --list image # Build the modos-api client image. +[no-cd] build: @echo "🐋 Building docker image" - cd {{root_dir}} && \ - {{ctr}} build \ - -f ./tools/image/Dockerfile \ - --build-arg="VERSION_BUILD={{tag}}" \ - -t {{registry}}/{{repository}}:{{tag}} . + {{ctr}} build \ + -f ./tools/image/Dockerfile \ + --build-arg=VERSION_BUILD=`{{tag_cmd}}` \ + -t {{registry}}/{{repository}}:`{{tag_cmd}}` . # Push the modos-api client image. +[no-cd] push: build - cd {{root_dir}} && \ - {{ctr}} push {{registry}}/{{repository}}:{{tag}} + {{ctr}} push {{registry}}/{{repository}}:`{{tag_cmd}}`