Testing: sort imports and add isort-only Ruff to pre-commit and autotests

.github/workflows/autotest.yml

@@ -20,6 +20,20 @@ jobs:
         shell: bash
         run: |
           python3 tools/add_header --dry-run --disable-progress-bar
+  python_ruff:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.11"
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install ruff
+      - name: Run Ruff
+        run: ruff check --output-format=github .
   python_annotations:
     if: |
       !startsWith(github.ref_name, 'release')

.pre-commit-config.yaml

@@ -15,3 +15,8 @@ repos:
     description: Run the `add_header` script to verify the file headers
     entry: tools/add_header
     language: system
+- repo: https://github.com/astral-sh/ruff-pre-commit
+  rev: v0.3.3
+  hooks:
+    - id: ruff
+      args: [ --fix ]

etc/docker/dev/configure_qbittorrent.py

@@ -14,12 +14,12 @@
 # limitations under the License.
 
 import json
-import re
 import os
+import re
 import sys
 import time
-import urllib.request
 import urllib.parse
+import urllib.request
 
 
 def wait_for_server(host, port, max_wait):

lib/rucio/api/did.py

@@ -23,13 +23,14 @@
 from rucio.common.types import InternalAccount, InternalScope
 from rucio.common.utils import api_update_return_dict
 from rucio.core import did, naming_convention
-from rucio.core.rse import get_rse_id
 from rucio.core import meta_conventions as meta_convention_core
+from rucio.core.rse import get_rse_id
 from rucio.db.sqla.constants import DIDType
 from rucio.db.sqla.session import read_session, stream_session, transactional_session
 
 if TYPE_CHECKING:
-    from typing import Any, Optional, Iterator
+    from typing import Any, Iterator, Optional
+
     from sqlalchemy.orm import Session
 
 

lib/rucio/api/identity.py

@@ -28,6 +28,7 @@
 
 if TYPE_CHECKING:
     from typing import Optional
+
     from sqlalchemy.orm import Session
 
 

lib/rucio/api/meta_conventions.py

@@ -13,16 +13,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from typing import TYPE_CHECKING, Union, Optional
+from typing import TYPE_CHECKING, Optional, Union
 
 from rucio.api.permission import has_permission
 from rucio.common.exception import AccessDenied
 from rucio.core import meta_conventions
-from rucio.db.sqla.session import read_session, transactional_session
 from rucio.db.sqla.constants import KeyType
+from rucio.db.sqla.session import read_session, transactional_session
 
 if TYPE_CHECKING:
     from sqlalchemy.orm import Session
+
     from rucio.common.types import InternalAccount
 
 

lib/rucio/api/rse.py

@@ -26,6 +26,7 @@
 
 if TYPE_CHECKING:
     from typing import Optional
+
     from sqlalchemy.orm import Session
 
 

lib/rucio/api/rule.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from typing import Any, TYPE_CHECKING
+from typing import TYPE_CHECKING, Any
 
 from rucio.api.permission import has_permission
 from rucio.common.config import config_get_bool

lib/rucio/api/subscription.py

@@ -18,7 +18,7 @@
 from typing import TYPE_CHECKING
 
 from rucio.api.permission import has_permission
-from rucio.common.exception import InvalidObject, AccessDenied
+from rucio.common.exception import AccessDenied, InvalidObject
 from rucio.common.schema import validate_schema
 from rucio.common.types import InternalAccount, InternalScope
 from rucio.core import subscription

lib/rucio/client/accountclient.py

@@ -18,8 +18,7 @@
 
 from requests.status_codes import codes
 
-from rucio.client.baseclient import BaseClient
-from rucio.client.baseclient import choice
+from rucio.client.baseclient import BaseClient, choice
 from rucio.common.utils import build_url
 
 

lib/rucio/client/accountlimitclient.py

@@ -18,8 +18,7 @@
 
 from requests.status_codes import codes
 
-from rucio.client.baseclient import BaseClient
-from rucio.client.baseclient import choice
+from rucio.client.baseclient import BaseClient, choice
 from rucio.common.utils import build_url
 
 

lib/rucio/client/baseclient.py

@@ -24,24 +24,22 @@
 import sys
 import time
 from configparser import NoOptionError, NoSectionError
-from os import environ, fdopen, path, makedirs, geteuid
+from os import environ, fdopen, geteuid, makedirs, path
 from shutil import move
 from tempfile import mkstemp
 from urllib.parse import urlparse
 
 from dogpile.cache import make_region
-from requests import Session, Response
+from requests import Response, Session
 from requests.exceptions import ConnectionError
 from requests.status_codes import codes
 
 from rucio import version
 from rucio.common import exception
 from rucio.common.config import config_get, config_get_bool, config_get_int
-from rucio.common.exception import (CannotAuthenticate, ClientProtocolNotSupported,
-                                    NoAuthInformation, MissingClientParameter,
-                                    MissingModuleException, ServerConnectionException)
+from rucio.common.exception import CannotAuthenticate, ClientProtocolNotSupported, MissingClientParameter, MissingModuleException, NoAuthInformation, ServerConnectionException
 from rucio.common.extra import import_extras
-from rucio.common.utils import build_url, get_tmp_dir, my_key_generator, parse_response, ssh_sign, setup_logger
+from rucio.common.utils import build_url, get_tmp_dir, my_key_generator, parse_response, setup_logger, ssh_sign
 
 EXTRA_MODULES = import_extras(['requests_kerberos'])
 

lib/rucio/client/configclient.py

@@ -17,8 +17,7 @@
 
 from requests.status_codes import codes
 
-from rucio.client.baseclient import BaseClient
-from rucio.client.baseclient import choice
+from rucio.client.baseclient import BaseClient, choice
 from rucio.common.utils import build_url
 
 

lib/rucio/client/credentialclient.py

@@ -15,8 +15,7 @@
 
 from requests.status_codes import codes
 
-from rucio.client.baseclient import BaseClient
-from rucio.client.baseclient import choice
+from rucio.client.baseclient import BaseClient, choice
 from rucio.common.utils import build_url
 
 

lib/rucio/client/didclient.py

@@ -15,15 +15,14 @@
 
 from datetime import datetime
 from json import dumps
-from typing import Optional, Any
+from typing import Any, Optional
 from urllib.parse import quote_plus
 
 from requests.status_codes import codes
 
-from rucio.client.baseclient import BaseClient
-from rucio.client.baseclient import choice
+from rucio.client.baseclient import BaseClient, choice
 from rucio.common.exception import DeprecationError
-from rucio.common.utils import build_url, render_json, render_json_list, date_to_str
+from rucio.common.utils import build_url, date_to_str, render_json, render_json_list
 
 
 class DIDClient(BaseClient):

lib/rucio/client/diracclient.py

@@ -17,8 +17,7 @@
 
 from requests.status_codes import codes
 
-from rucio.client.baseclient import BaseClient
-from rucio.client.baseclient import choice
+from rucio.client.baseclient import BaseClient, choice
 from rucio.common.utils import build_url
 
 

lib/rucio/client/downloadclient.py

@@ -23,18 +23,16 @@
 import signal
 import subprocess
 import time
-from queue import Queue, Empty, deque
+from queue import Empty, Queue, deque
 from threading import Thread
 
 from rucio import version
 from rucio.client.client import Client
 from rucio.common.config import config_get
 from rucio.common.didtype import DID
-from rucio.common.exception import (InputValidationError, NoFilesDownloaded, NotAllFilesDownloaded, RucioException)
+from rucio.common.exception import InputValidationError, NoFilesDownloaded, NotAllFilesDownloaded, RucioException
 from rucio.common.pcache import Pcache
-from rucio.common.utils import GLOBALLY_SUPPORTED_CHECKSUMS, CHECKSUM_ALGO_DICT, PREFERRED_CHECKSUM
-from rucio.common.utils import adler32, detect_client_location, generate_uuid, parse_replicas_from_string, \
-    send_trace, sizefmt, execute, parse_replicas_from_file, extract_scope
+from rucio.common.utils import CHECKSUM_ALGO_DICT, GLOBALLY_SUPPORTED_CHECKSUMS, PREFERRED_CHECKSUM, adler32, detect_client_location, execute, extract_scope, generate_uuid, parse_replicas_from_file, parse_replicas_from_string, send_trace, sizefmt
 from rucio.rse import rsemanager as rsemgr
 
 

lib/rucio/client/exportclient.py

@@ -15,8 +15,7 @@
 
 from requests.status_codes import codes
 
-from rucio.client.baseclient import BaseClient
-from rucio.client.baseclient import choice
+from rucio.client.baseclient import BaseClient, choice
 from rucio.common.utils import build_url, parse_response
 
 

lib/rucio/client/fileclient.py

@@ -18,8 +18,7 @@
 
 from requests.status_codes import codes
 
-from rucio.client.baseclient import BaseClient
-from rucio.client.baseclient import choice
+from rucio.client.baseclient import BaseClient, choice
 from rucio.common.utils import build_url
 
 

lib/rucio/client/importclient.py

@@ -15,8 +15,7 @@
 
 from requests.status_codes import codes
 
-from rucio.client.baseclient import BaseClient
-from rucio.client.baseclient import choice
+from rucio.client.baseclient import BaseClient, choice
 from rucio.common.utils import build_url, render_json
 
 

lib/rucio/client/lifetimeclient.py

@@ -17,8 +17,7 @@
 
 from requests.status_codes import codes
 
-from rucio.client.baseclient import BaseClient
-from rucio.client.baseclient import choice
+from rucio.client.baseclient import BaseClient, choice
 from rucio.common.utils import build_url, render_json
 
 

lib/rucio/client/lockclient.py

@@ -17,8 +17,7 @@
 
 from requests.status_codes import codes
 
-from rucio.client.baseclient import BaseClient
-from rucio.client.baseclient import choice
+from rucio.client.baseclient import BaseClient, choice
 from rucio.common.utils import build_url, render_json
 
 

lib/rucio/client/metaconventionsclient.py

@@ -14,15 +14,13 @@
 # limitations under the License.
 
 from json import dumps, loads
+from typing import TYPE_CHECKING, Optional, Union
 from urllib.parse import quote_plus
 
 from requests.status_codes import codes
 
-from rucio.client.baseclient import BaseClient
-from rucio.client.baseclient import choice
+from rucio.client.baseclient import BaseClient, choice
 from rucio.common.utils import build_url
-from typing import Union, Optional, TYPE_CHECKING
-
 
 if TYPE_CHECKING:
     from rucio.db.sqla.constants import KeyType

lib/rucio/client/replicaclient.py

@@ -19,9 +19,8 @@
 
 from requests.status_codes import codes
 
-from rucio.client.baseclient import BaseClient
-from rucio.client.baseclient import choice
-from rucio.common.utils import build_url, render_json, chunks
+from rucio.client.baseclient import BaseClient, choice
+from rucio.common.utils import build_url, chunks, render_json
 
 
 class ReplicaClient(BaseClient):

lib/rucio/client/requestclient.py

@@ -17,8 +17,7 @@
 
 from requests.status_codes import codes
 
-from rucio.client.baseclient import BaseClient
-from rucio.client.baseclient import choice
+from rucio.client.baseclient import BaseClient, choice
 from rucio.common.utils import build_url
 
 

lib/rucio/client/rseclient.py

@@ -18,8 +18,7 @@
 
 from requests.status_codes import codes
 
-from rucio.client.baseclient import BaseClient
-from rucio.client.baseclient import choice
+from rucio.client.baseclient import BaseClient, choice
 from rucio.common.utils import build_url
 
 

lib/rucio/client/ruleclient.py

@@ -19,8 +19,7 @@
 
 from requests.status_codes import codes
 
-from rucio.client.baseclient import BaseClient
-from rucio.client.baseclient import choice
+from rucio.client.baseclient import BaseClient, choice
 from rucio.common.utils import build_url
 
 

lib/rucio/client/scopeclient.py

@@ -18,8 +18,7 @@
 
 from requests.status_codes import codes
 
-from rucio.client.baseclient import BaseClient
-from rucio.client.baseclient import choice
+from rucio.client.baseclient import BaseClient, choice
 from rucio.common.utils import build_url
 
 

lib/rucio/client/subscriptionclient.py

@@ -17,8 +17,7 @@
 
 from requests.status_codes import codes
 
-from rucio.client.baseclient import BaseClient
-from rucio.client.baseclient import choice
+from rucio.client.baseclient import BaseClient, choice
 from rucio.common.utils import build_url
 
 

lib/rucio/client/touchclient.py

@@ -17,8 +17,7 @@
 
 from requests import post
 
-from rucio.client.baseclient import BaseClient
-from rucio.client.baseclient import choice
+from rucio.client.baseclient import BaseClient, choice
 from rucio.common.exception import RucioException, UnsupportedDIDType