style: ran 'find -name *.py -not -path ./src/diracx/client/* -exec py…

…upgrade --py311-plus {} +'

src/diracx/cli/__init__.py

@@ -22,8 +22,8 @@
 @app.async_command()
 async def login(
     vo: str,
-    group: Optional[str] = None,
-    property: Optional[list[str]] = Option(
+    group: str | None = None,
+    property: list[str] | None = Option(
         None, help="Override the default(s) with one or more properties"
     ),
 ):
@@ -82,7 +82,7 @@ async def logout():
 
 
 @app.callback()
-def callback(output_format: Optional[str] = None):
+def callback(output_format: str | None = None):
     if "DIRACX_OUTPUT_FORMAT" not in os.environ:
         output_format = output_format or "RICH"
     if output_format is not None:

src/diracx/cli/internal.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 import json
 from pathlib import Path
 

src/diracx/core/config/schema.py

@@ -49,12 +49,12 @@ class GroupConfig(BaseModel):
     AutoAddVOMS: bool = False
     AutoUploadPilotProxy: bool = False
     AutoUploadProxy: bool = False
-    JobShare: Optional[int]
+    JobShare: int | None
     Properties: list[SecurityProperty]
-    Quota: Optional[int]
+    Quota: int | None
     Users: list[str]
     AllowBackgroundTQs: bool = False
-    VOMSRole: Optional[str]
+    VOMSRole: str | None
     AutoSyncVOMS: bool = False
 
 

src/diracx/core/extensions.py

@@ -1,12 +1,10 @@
-from __future__ import absolute_import
-
 __all__ = ("select_from_extension",)
 
 import os
 from collections import defaultdict
 from importlib.metadata import EntryPoint, entry_points
 from importlib.util import find_spec
-from typing import Iterator
+from collections.abc import Iterator
 
 
 def extensions_by_priority() -> Iterator[str]:

src/diracx/core/properties.py

@@ -5,7 +5,7 @@
 
 import inspect
 import operator
-from typing import Callable
+from collections.abc import Callable
 
 from diracx.core.extensions import select_from_extension
 

src/diracx/db/utils.py

@@ -8,7 +8,8 @@
 from abc import ABCMeta
 from datetime import datetime, timedelta, timezone
 from functools import partial
-from typing import TYPE_CHECKING, AsyncIterator, Self
+from typing import TYPE_CHECKING, Self
+from collections.abc import AsyncIterator
 
 from pydantic import parse_obj_as
 from sqlalchemy import Column as RawColumn

src/diracx/routers/__init__.py

@@ -4,7 +4,8 @@
 import logging
 import os
 from functools import partial
-from typing import AsyncContextManager, AsyncGenerator, Iterable, TypeVar
+from typing import AsyncContextManager, TypeVar
+from collections.abc import AsyncGenerator, Iterable
 
 import dotenv
 from fastapi import APIRouter, Depends, Request