Fix 2164 (#2165)

* add branch audit file

* fix: add missing @inlineCallbacks decorators (#2164)

Add missing @inlineCallbacks decorator to RouterWebServiceWebhook.create()
and MarketMaker.revoke_offer(). Without the decorator, these functions
silently return generator objects instead of executing the async code.

Note: This work was completed with AI assistance (Claude Code).

* chore: bump version to 26.4.1.dev1

* fix: add bump-dev recipe for auto CalVer versioning (#2166)

Add bump-dev recipe that auto-computes the next dev version from the
current date (YY.M.1.dev1) instead of requiring manual version input.

Note: This work was completed with AI assistance (Claude Code).

* fix: replace deprecated pkg_resources with importlib.resources (#2167)

Replace pkg_resources.resource_filename() calls in test_util.py with
importlib.resources.files(). pkg_resources has been removed from recent
setuptools versions, breaking CI on environments without it.

Note: This work was completed with AI assistance (Claude Code).

* fix: correct import ordering in test_util.py

Group stdlib import (importlib.resources) with other stdlib imports
to satisfy ruff import sorting rules.

Note: This work was completed with AI assistance (Claude Code).

* add release key for 26.4

* fix: handle ty version differences in check-typing recipe

Auto-detect whether ty uses "not-subscriptable" (older) or
"non-subscriptable" (newer) rule name to avoid unknown-rule warnings
across different ty versions.

Note: This work was completed with AI assistance (Claude Code).

* docs: add changelog entry for 26.4.1

Note: This work was completed with AI assistance (Claude Code).

Author: oberstet

.audit/oberstet_fix_2164.md

@@ -0,0 +1,8 @@
+- [ ] I did **not** use any AI-assistance tools to help create this pull request.
+- [x] I **did** use AI-assistance tools to *help* create this pull request.
+- [x] I have read, understood and followed the project's AI_POLICY.md when creating code, documentation etc. for this pull request.
+
+Submitted by: @oberstet
+Date: 2026-04-02
+Related issue(s): #2164
+Branch: oberstet:fix_2164

docs/changelog.rst

@@ -5,6 +5,15 @@
 Changelog
 =========
 
+26.4.1
+------
+
+* fix: add missing ``@inlineCallbacks`` decorator on ``RouterWebServiceWebhook.create()`` (`#2164 <https://github.com/crossbario/crossbar/issues/2164>`_)
+* fix: add missing ``@inlineCallbacks`` decorator on ``MarketMaker.revoke_offer()`` (`#2164 <https://github.com/crossbario/crossbar/issues/2164>`_)
+* fix: replace deprecated ``pkg_resources`` with ``importlib.resources`` in test code (`#2167 <https://github.com/crossbario/crossbar/issues/2167>`_)
+* new: add ``bump-dev`` justfile recipe for auto CalVer versioning (`#2166 <https://github.com/crossbario/crossbar/issues/2166>`_)
+* fix: handle ``ty`` rule name differences across versions in ``check-typing`` recipe
+
 25.12.1
 -------
 

justfile

@@ -330,6 +330,14 @@ prep-release:
     @echo 'For rel key: this must be done (incl. *.sec key handling) by maintainer!'
     @echo ''
 
+# Auto-bump to next dev version based on current date (CalVer: YY.M.1.dev1)
+bump-dev:
+    #!/usr/bin/env bash
+    set -e
+    NEXT="$(date +%-y).$(date +%-m).1.dev1"
+    echo "Auto-computed next dev version: ${NEXT}"
+    just bump-next "${NEXT}"
+
 # Post-Tag Bump: Set a specific next version (e.g. `just bump-next 26.1.2.dev1`)
 bump-next next_version:
     @echo "Bumping metadata to {{next_version}}..."
@@ -553,6 +561,15 @@ check-typing venv="":
     VENV_PYTHON=$(just --quiet _get-venv-python {{ venv }})
     echo "==> Running static type checks with ty..."
     echo "    Using Python: ${VENV_PYTHON}"
+
+    # ty renamed "not-subscriptable" to "non-subscriptable" between versions;
+    # detect which name this version uses to avoid unknown-rule warnings.
+    if ty check --ignore non-subscriptable src/crossbar/__init__.py --python "${VENV_PYTHON}" 2>&1 | grep -q 'Unknown rule.*non-subscriptable'; then
+        SUBSCRIPT_RULE="not-subscriptable"
+    else
+        SUBSCRIPT_RULE="non-subscriptable"
+    fi
+
     ty check \
         --python "${VENV_PYTHON}" \
         --ignore unresolved-import \
@@ -571,7 +588,7 @@ check-typing venv="":
         --ignore too-many-positional-arguments \
         --ignore unknown-argument \
         --ignore missing-argument \
-        --ignore not-subscriptable \
+        --ignore "${SUBSCRIPT_RULE}" \
         --ignore not-iterable \
         --ignore no-matching-overload \
         --ignore conflicting-declarations \

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "crossbar"
-version = "26.1.1.dev1"
+version = "26.4.1.dev1"
 description = "Crossbar.io multi-protocol (WAMP/WebSocket, REST/HTTP, MQTT) application router for microservices."
 readme = "README.md"
 requires-python = ">=3.11"

src/crossbar/_version.py

@@ -5,5 +5,5 @@
 #
 #####################################################################################
 
-__version__ = "26.1.1.dev1"
+__version__ = "26.4.1.dev1"
 __build__ = "19000101-0000000"

src/crossbar/common/keys/crossbar-26-4.pub

@@ -0,0 +1,2 @@
+untrusted comment: Crossbar.io 26.4 public key
+RWT9T8LGH9HFyNBDWe4v7pGHPROuxOxgYMMso5Qy//e4uPLwByd/1S0Q

src/crossbar/edge/worker/xbr/_marketmaker.py

@@ -1054,6 +1054,7 @@ def query_offers(
         raise NotImplementedError()
 
     @wamp.register(None, check_types=True)
+    @inlineCallbacks
     def revoke_offer(self, key_id, details: Optional[CallDetails] = None):
         """
         Called by XBR Provider to revoke (on-going) sale of a key. The market maker will stop

src/crossbar/test/test_util.py

@@ -7,8 +7,8 @@
 
 import copy
 import json
+from importlib.resources import files
 
-import pkg_resources
 import pytest
 
 from crossbar._util import _deep_merge_object, merge_config
@@ -22,11 +22,8 @@ def master_personality():
 
 @pytest.fixture(scope="function")
 def master_config():
-    # built-in config
-    # filename = pkg_resources.resource_filename('crossbar', 'master/node/config.json')
-
     # "copied" built-in config for testing
-    filename = pkg_resources.resource_filename("crossbar", "test/test_config.json")
+    filename = str(files("crossbar").joinpath("test/test_config.json"))
 
     with open(filename) as f:
         config = json.load(f)
@@ -258,14 +255,14 @@ def test_merge_same(master_personality, master_config):
 
 def make_test_func(cfg_name):
     def test_merge_config(master_personality, master_config):
-        filename = pkg_resources.resource_filename("crossbar", "tests/test_{}.json".format(cfg_name))
+        filename = str(files("crossbar").joinpath("tests/test_{}.json".format(cfg_name)))
         with open(filename) as f:
             test_config = json.load(f)
 
             # a mergeable override-config does NOT need to be valid in itself
             # MasterPersonality.check_config(MasterPersonality, test_config)
 
-        filename = pkg_resources.resource_filename("crossbar", "tests/test_{}_merged.json".format(cfg_name))
+        filename = str(files("crossbar").joinpath("tests/test_{}_merged.json".format(cfg_name)))
         with open(filename) as f:
             test_config_merged = json.load(f)
             MasterPersonality.check_config(MasterPersonality, test_config_merged)
@@ -288,7 +285,7 @@ def test_merge_config(master_personality, master_config):
     sys.setrecursionlimit(10000)
 
     # this is the base config into the test configs will be merged
-    filename = pkg_resources.resource_filename("crossbar", "tests/test_config.json")
+    filename = str(files("crossbar").joinpath("tests/test_config.json"))
     with open(filename) as f:
         _master_config = json.load(f)
 

src/crossbar/webservice/rest.py

@@ -137,6 +137,7 @@ class RouterWebServiceWebhook(RouterWebService):
     """
 
     @staticmethod
+    @inlineCallbacks
     def create(transport, path: str, config: Dict[str, Any]):
         """
         Create a new HTTP/POST Webhook service (part of REST-bridge).