Merge remote-tracking branch 'upstream/master' into bep038

Author: effigies

.github/workflows/schemacode_ci.yml

@@ -33,7 +33,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@v6
+        uses: astral-sh/setup-uv@v7
         if: ${{ startsWith(github.ref, 'refs/tags/schema-') }}
       - name: "Build archive on tag"
         run: |
@@ -65,7 +65,7 @@ jobs:
       - uses: actions/checkout@v5
 
       - name: Set up Python ${{ matrix.python-version }} (uv)
-        uses: astral-sh/setup-uv@v6
+        uses: astral-sh/setup-uv@v7
         with:
           python-version: ${{ matrix.python-version }}
           activate-environment: true

.github/workflows/validation.yml

@@ -37,7 +37,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5
-      - uses: astral-sh/setup-uv@v6
+      - uses: astral-sh/setup-uv@v7
       - name: Lint yml files in src/schema
         run: uvx yamllint -f standard src/schema/ -c .yamllint.yml
 
@@ -46,7 +46,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5
-      - uses: astral-sh/setup-uv@v6
+      - uses: astral-sh/setup-uv@v7
       - run: uvx ruff format --diff
       - run: uvx ruff check
 
@@ -55,7 +55,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5
-      - uses: astral-sh/setup-uv@v6
+      - uses: astral-sh/setup-uv@v7
       - name: Check for Latin phrases
         run: uv run tools/no-bad-latin.py
 
@@ -64,7 +64,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5
-      - uses: astral-sh/setup-uv@v6
+      - uses: astral-sh/setup-uv@v7
       - name: Validate CITATION.cff
         run: uvx cffconvert --validate
       - name: Check for Zenodo compatibility

tools/schemacode/src/bidsschematools/render/tsv.py

@@ -7,12 +7,12 @@
 from markdown_it import MarkdownIt
 from tabulate import tabulate
 
-from ..utils import filter_warnings, in_context
+from ..utils import WarningsFilter, in_context
 from .utils import propagate_fence_exception
 
 
-@in_context(filter_warnings(["error"]))
 @propagate_fence_exception
+@in_context(WarningsFilter(["error"]))
 def fence(
     source: str,
     language: str,

tools/schemacode/src/bidsschematools/utils.py

@@ -179,14 +179,19 @@ def wrapper(*args, **kwargs):
     return decorator
 
 
-@contextmanager
-def filter_warnings(*filters):
+class WarningsFilter:
     """Context manager to apply warning filters.
 
     Arguments are lists of positional arguments to :func:`warnings.filterwarnings`.
     """
+    def __init__(self, *filters):
+        self.filters = filters
 
-    with warnings.catch_warnings():
-        for filt in filters:
+    def __enter__(self):
+        self.catcher = warnings.catch_warnings()
+        self.catcher.__enter__()
+        for filt in self.filters:
             warnings.filterwarnings(*filt)
-        yield
+
+    def __exit__(self, exc_type, exc_value, traceback):
+        self.catcher.__exit__(exc_type, exc_value, traceback)