[459] Attempt to fix ruff differences (#463)

* changes

* debug

* changes

* changes

Author: tjhunter

.github/workflows/ci.yml

@@ -26,11 +26,11 @@ jobs:
       - name: Run ruff (black)
         # Do not attempt to install the default dependencies, this is much faster.
         # Run temporarily on a sub directory before the main restyling.
-        run: uv run --no-project --with "ruff==0.9.7" ruff format --target-version py312 --check -n src/ scripts/
+        run: uv run --no-project --with "ruff==0.12.2" ruff format --target-version py312 --check -n src/ scripts/
 
       - name: Run ruff (flake8)
         # Do not attempt to install the default dependencies, this is much faster.
-        run: uv run --no-project --with "ruff==0.9.7" ruff check src/ 
+        run: uv run --no-project --verbose --with "ruff==0.12.2" ruff check src/ 
   pr:
     name: PR checks
     runs-on: ubuntu-latest

pyproject.toml

@@ -7,7 +7,7 @@ authors = [
     { name = "WeatherGenerator collaboration" }
 ]
 
-requires-python = ">=3.11,<3.13"
+requires-python = ">=3.12,<3.13"
 # TODO: split the plotting dependencies into their own dep groups, they are not required.
 dependencies = [
  'torch==2.6.0',
@@ -99,7 +99,6 @@ ignore = [
   "SIM118",
   "SIM102",
   "SIM401",
-  "UP040", # TODO: enable later
   # To ignore, not relevant for us
   "SIM108" # in case additional norm layer supports are added in future  
 ]

src/weathergen/datasets/data_reader_base.py

@@ -11,7 +11,6 @@
 import logging
 from abc import abstractmethod
 from dataclasses import dataclass
-from typing import TypeAlias
 
 import numpy as np
 from numpy import datetime64, timedelta64
@@ -22,16 +21,16 @@
 _logger = logging.getLogger(__name__)
 
 # The numpy date time 64 time (nanosecond precision)
-NPDT64: TypeAlias = datetime64
+type NPDT64 = datetime64
 # The numpy delta time 64 time (nanosecond precision)
-NPTDel64: TypeAlias = timedelta64
+type NPTDel64 = timedelta64
 
-DType: TypeAlias = np.float32  # The type for the data in the datasets.
+type DType = np.float32  # The type for the data in the datasets.
 
 """
 The type for indexing into datasets. It is a multiple of hours.
 """
-TIndex: TypeAlias = np.int64
+type TIndex = np.int64
 
 
 _DT_ZERO = np.datetime64("1850-01-01T00:00")

src/weathergen/utils/better_abc.py

@@ -10,16 +10,14 @@
 
 from abc import ABCMeta as NativeABCMeta
 from collections.abc import Callable
-from typing import Any, TypeVar, cast
-
-R = TypeVar("R")
+from typing import Any, cast
 
 
 class DummyAttribute:
     pass
 
 
-def abstract_attribute(obj: Callable[[Any], R] | None = None) -> R:
+def abstract_attribute[R](obj: Callable[[Any], R] | None = None) -> R:
     _obj = cast(Any, obj)
     if obj is None:
         _obj = DummyAttribute()