sty: Add pyupgrade checks

Author: effigies

tools/schemacode/pyproject.toml

@@ -144,6 +144,7 @@ select = [
     "Q",  # flake8-quotes
     "YTT",  # flake8-2020
     "ISC",  # implicit-string-concatenation
+    "UP",  # pyupgrade
 
     # Intend to evaluate these for inclusion
     # "PD",  # pandas-vet

tools/schemacode/src/bidsschematools/conftest.py

@@ -1,8 +1,8 @@
 import logging
 import tempfile
+from collections.abc import Generator
 from pathlib import Path
 from subprocess import run
-from typing import Generator
 
 import pytest
 

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

@@ -2,8 +2,6 @@
 
 from __future__ import annotations
 
-import typing as ty
-
 import pandas as pd
 from tabulate import tabulate
 
@@ -133,8 +131,8 @@ def _make_object_table(
 def _make_table_from_rule(
     schema: Namespace,
     table_type: str,
-    table_name: ty.Union[str, ty.List[str]],
-    src_path: ty.Optional[str] = None,
+    table_name: str | list[str],
+    src_path: str | None = None,
     tablefmt: str = "github",
 ):
     """Create a table for one or more rules.
@@ -404,8 +402,8 @@ def preproc_suffix(row):
 
 def make_json_table(
     schema: Namespace,
-    table_name: ty.Union[str, ty.List[str]],
-    src_path: ty.Optional[str] = None,
+    table_name: str | list[str],
+    src_path: str | None = None,
     tablefmt: str = "github",
 ):
     """Produce metadata table (markdown) based on requested fields.
@@ -440,8 +438,8 @@ def make_json_table(
 
 def make_sidecar_table(
     schema: Namespace,
-    table_name: ty.Union[str, ty.List[str]],
-    src_path: ty.Optional[str] = None,
+    table_name: str | list[str],
+    src_path: str | None = None,
     tablefmt: str = "github",
 ):
     """Produce metadata table (markdown) based on requested fields.
@@ -539,7 +537,7 @@ def make_metadata_table(schema, field_info, src_path=None, tablefmt="github"):
 def make_subobject_table(
     schema: Namespace,
     object_name: str,
-    src_path: ty.Optional[str] = None,
+    src_path: str | None = None,
     tablefmt: str = "github",
 ):
     """Create a metadata table (markdown) based on the properties of an object
@@ -590,7 +588,7 @@ def make_subobject_table(
 def make_columns_table(
     schema: Namespace,
     table_name: str,
-    src_path: ty.Optional[str] = None,
+    src_path: str | None = None,
     tablefmt: str = "github",
 ):
     """Produce columns table (markdown) based on requested fields.

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

@@ -60,7 +60,7 @@ def _make_entity_definition(entity, entity_info):
     """Describe an entity."""
     entity_shorthand = entity_info["name"]
     text = ""
-    text += "## {}".format(entity_shorthand)
+    text += f"## {entity_shorthand}"
     text += "\n\n"
     text += f"**Full name**: {entity_info['display_name']}"
     text += "\n\n"

tools/schemacode/src/bidsschematools/rules.py

@@ -6,7 +6,6 @@
 
 import fnmatch
 import re
-import typing as ty
 from collections.abc import Mapping
 from functools import lru_cache
 
@@ -64,7 +63,7 @@ def _optional_regex(regex, optional):
     return f"(?:{regex})?" if optional else regex
 
 
-@lru_cache()
+@lru_cache
 def _format_entity(entity, name, pattern, level, directory=False):
     if directory and entity not in DIR_ENTITIES:
         return ""
@@ -141,7 +140,7 @@ def _entity_rule(rule: Mapping, schema: bst.types.Namespace):
     }
 
 
-def _split_inheritance_rules(rule: dict) -> ty.List[dict]:
+def _split_inheritance_rules(rule: dict) -> list[dict]:
     """Break composite rules into main and sidecar rules
 
     Implements the inheritance principle for file naming.
@@ -237,7 +236,7 @@ def regexify_filename_rules(
     return regex_schema
 
 
-@lru_cache()
+@lru_cache
 def regexify_all(schema_dir=None):
     """
     Create full path regexes for all BIDS specification files.

tools/schemacode/src/bidsschematools/schema.py

@@ -175,7 +175,7 @@ def flatten_enums(namespace, inplace=True):
     return namespace
 
 
-@lru_cache()
+@lru_cache
 def load_schema(schema_path=None):
     """Load the schema into a dictionary.
 

tools/schemacode/src/bidsschematools/tests/test_expressions.py

@@ -1,6 +1,5 @@
 from collections.abc import Mapping
 from functools import singledispatch
-from typing import Union
 
 import pytest
 from pyparsing.exceptions import ParseException
@@ -147,7 +146,7 @@ def test_test_valid_sidecar_field():
 
 
 @singledispatch
-def find_names(node: Union[ASTNode, str]):
+def find_names(node: ASTNode | str):
     # Walk AST nodes
     if isinstance(node, BinOp):
         yield from find_names(node.lh)

tools/schemacode/src/bidsschematools/types/namespace.py

@@ -13,7 +13,7 @@
 import yaml
 
 
-def _expand_dots(entry: ty.Tuple[str, ty.Any]) -> ty.Tuple[str, ty.Any]:
+def _expand_dots(entry: tuple[str, ty.Any]) -> tuple[str, ty.Any]:
     # Helper function for expand
     key, val = entry
     if "." in key:
@@ -220,7 +220,7 @@ def __getattribute__(self, key):
         except KeyError:
             raise err
 
-    def _get_mapping(self, key: str) -> ty.Tuple[Mapping, str]:
+    def _get_mapping(self, key: str) -> tuple[Mapping, str]:
         subkeys = key.split(".")
         mapping = self._properties
         for subkey in subkeys[:-1]:

tools/schemacode/src/bidsschematools/utils.py

@@ -36,7 +36,7 @@ def get_logger(name=None, level=None):
     logging.Logger
         logger object.
     """
-    logger = logging.getLogger("bidsschematools" + (".%s" % name if name else ""))
+    logger = logging.getLogger("bidsschematools" + (f".{name}" if name else ""))
     # If explicitly instructed via env var -- set log level
     if log_level := os.getenv("BIDS_SCHEMA_LOG_LEVEL", level):
         set_logger_level(logger, log_level)
@@ -79,6 +79,6 @@ def set_logger_level(lgr, level):
     elif level.isalpha():
         level = getattr(logging, level)
     else:
-        lgr.warning("Do not know how to treat loglevel %s" % level)
+        lgr.warning("Do not know how to treat loglevel %s", level)
         return
     lgr.setLevel(level)