Merge remote-tracking branch 'origin/release_bfabric_scripts'

Author: leoschwarz

.github/scripts/extract_changelog.py

@@ -0,0 +1,24 @@
+#!/usr/bin/env python3
+import re
+import sys
+
+
+def extract_changelog(version, changelog_path):
+    with open(changelog_path) as f:
+        content = f.read()
+
+    match = re.search(rf"^## \[{re.escape(version)}\].*?(?=^## \[|\Z)", content, re.M | re.S)
+
+    if match:
+        return match.group(0).strip()
+    return ""
+
+
+if __name__ == "__main__":
+    if len(sys.argv) != 3:
+        print("Usage: extract_changelog.py VERSION CHANGELOG_PATH")
+        sys.exit(1)
+
+    version = sys.argv[1]
+    changelog_path = sys.argv[2]
+    print(extract_changelog(version, changelog_path))

.github/workflows/run_unit_tests.yml

@@ -1,9 +1,9 @@
 name: PR Checks
 on:
   push:
-    branches: [main, stable]
+    branches: [main, stable, release_*]
   pull_request:
-    branches: [main, stable]
+    branches: [main, stable, release_*]
   workflow_dispatch:
 jobs:
   unit_tests:

bfabric/docs/changelog.md

@@ -10,6 +10,10 @@ Versioning currently follows `X.Y.Z` where
 
 ## \[Unreleased\]
 
+### Removed
+
+- `cyclopts` is not a dependency of `bfabric` anymore, but rather of `bfabric-scripts` and `bfabric-app-runner`.
+
 ## \[1.13.23\] - 2025-03-25
 
 ### Fixed

bfabric/pyproject.toml

@@ -28,7 +28,6 @@ dependencies = [
     "pydantic>=2.9.2",
     "eval_type_backport; python_version < '3.10'",
     "python-dateutil >= 2.9.0",
-    "cyclopts >= 2.9.9",
     "requests >= 2.26.0",
     #"platformdirs >= 4.3",
 ]

bfabric_app_runner/docs/changelog.md

@@ -13,6 +13,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 
 - Submitter params in app definition, use key `params` rather than `config` to be more explicit.
 
+### Fixed
+
+- Temporary workaround for https://github.com/fgcz/bfabricPy/issues/168.
+
 ## \[0.0.20\] - 2025-03-25
 
 ### Changed

bfabric_app_runner/pyproject.toml

@@ -13,6 +13,8 @@ authors = [
 requires-python = ">=3.12"
 dependencies = [
     "bfabric==1.13.23",
+    # TODO(leo): https://github.com/fgcz/bfabricPy/issues/168
+    "cyclopts >= 3.8.0,<3.11.0",
     "pydantic",
     "glom",
     "mako",

bfabric_scripts/docs/changelog.md

@@ -14,6 +14,12 @@ Versioning currently follows `X.Y.Z` where
 
 - Remove `bfabric-cli api save` -> use `bfabric-cli api create` and `bfabric-cli api update` instead.
 
+## \[1.13.25\] - 2025-03-27
+
+### Fixed
+
+- Temporary workaround for https://github.com/fgcz/bfabricPy/issues/168.
+
 ## \[1.13.24\] - 2025-02-19
 
 ### Fixed

bfabric_scripts/pyproject.toml

@@ -5,10 +5,12 @@ build-backend = "hatchling.build"
 [project]
 name = "bfabric_scripts"
 description = "Python command line scripts for the B-Fabric API"
-version = "1.13.24"
+version = "1.13.25"
 
 dependencies = [
-    "bfabric==1.13.22"
+    "bfabric==1.13.22",
+    # TODO(leo): https://github.com/fgcz/bfabricPy/issues/168
+    "cyclopts >= 3.8.0,<3.11.0",
 ]
 
 [project.optional-dependencies]