Format and lint code using ruff (#634)

- Change formatter and linter to `hatch fmt` (which uses `ruff`)
- Implement any changes to make `hatch fmt` happy

---------

Co-authored-by: Copilot <[email protected]>

Author: Archmonger

.github/copilot-instructions.md

@@ -17,7 +17,7 @@ Bootstrap, build, and test the repository:
 - `hatch run functional:all` – end-to-end functional (SQLite + PostgreSQL live scripts) (≈10–15s) **NEVER CANCEL.**
   - `hatch run functional:sqlite --all` – only SQLite functional cycle
   - `hatch run functional:postgres --all` – only PostgreSQL functional cycle
-- `hatch run lint:check` – lint (ruff + pylint) (≈5s)
+- `hatch run lint:check` – lint (ruff) (≈5s)
 - `hatch run docs:build` – build documentation (≈2s, strict)
 - `hatch run docs:serve` – local docs server (http://localhost:8000)
 - `hatch run docs:linkcheck` – validate internal/external links & spelling
@@ -40,8 +40,7 @@ Run tests in multiple configurations:
 - `hatch run functional:all -v` – functional backup/restore (SQLite + PostgreSQL)
 - `hatch run functional:sqlite --all -v` – functional (SQLite only)
 - `hatch run functional:postgres --all -v` – functional (PostgreSQL only)
-- `hatch run lint:check` – linting
-- `hatch run lint:format` – auto-format (Ruff)
+- `hatch fmt --check` – Python formatting and linting using ruff
 
 Expected test results:
 
@@ -103,7 +102,7 @@ Modern development process using Hatch:
 3. **Run unit tests**: `hatch test` (≈30s) **All must pass - failures are never expected or allowed.**
 4. **Run functional tests**: `hatch run functional:all -v` (≈10–15s)
 5. **Run linting**: `hatch run lint:check` (5 seconds)
-6. **Auto-format code**: `hatch run lint:format` (2 seconds)
+6. **Auto-format code**: `hatch fmt` (2 seconds)
 7. **Test documentation**: `hatch run docs:build` (2 seconds)
 8. **Update documentation** when making changes to Python source code (required)
 9. **Add changelog entry** for all significant changes (bug fixes, new features, breaking changes) to `CHANGELOG.md` under the "Unreleased" section.
@@ -136,7 +135,7 @@ Key directories and files:
 
 Key configuration files:
 
-- `pyproject.toml` – all tool configuration (Hatch, Ruff, PyLint, PyTest, Coverage)
+- `pyproject.toml` – all tool configuration (Hatch, Ruff, PyTest, Coverage)
 - `.pre-commit-config.yaml` – git pre-commit hooks
 - `tests/settings.py` – Django test settings (locmem email backend)
 
@@ -152,9 +151,8 @@ hatch test --python 3.12             # Test specific Python version subset
 hatch run functional:all             # Functional tests (SQLite + PostgreSQL)
 hatch run functional:sqlite --all    # Functional tests (SQLite only)
 hatch run functional:postgres --all  # Functional tests (PostgreSQL only)
-hatch run lint:check                 # Lint (ruff + pylint)
-hatch run lint:format                # Auto-format
-hatch run lint:format-check          # Format check only
+hatch fmt --check                    # Check formatting and linting
+hatch fmt                            # Auto-format and lint
 hatch run docs:build                 # Build documentation (strict)
 hatch run docs:serve                 # Serve docs locally
 hatch run precommit:check            # Run all pre-commit hooks
@@ -168,8 +166,6 @@ hatch build                          # Build distribution packages
 hatch env show                       # Show all environments
 hatch shell                          # Default dev shell
 hatch shell functional               # Functional env shell
-hatch shell lint                     # Lint env shell
-hatch run --env lint ruff --version  # Run command in lint env
 hatch python install 3.13            # (Optional) Install Python 3.13 via Hatch
 ```
 
@@ -184,7 +180,6 @@ Modern isolated environments configured in pyproject.toml:
 
 ### Development Environments
 
-- **lint**: Code quality (ruff, pylint)
 - **docs**: Documentation building (mkdocs-material)
 - **precommit**: Git hooks management
 
@@ -225,7 +220,7 @@ Core runtime dependency:
 Development dependencies (managed by hatch):
 
 - **Testing**: coverage, django-storages, psycopg2-binary, python-gnupg, testfixtures, python-dotenv
-- **Linting**: ruff, pylint
+- **Linting**: ruff
 - **Documentation**: mkdocs, mkdocs-material, mkdocs-git-revision-date-localized-plugin, mkdocs-include-markdown-plugin, mkdocs-spellcheck[all], mkdocs-git-authors-plugin, mkdocs-minify-plugin, mike, linkcheckmd
 - **Pre-commit**: pre-commit
 

dbbackup/db/base.py

@@ -8,12 +8,12 @@
 from importlib import import_module
 from subprocess import Popen
 from tempfile import SpooledTemporaryFile
+from typing import Any, ClassVar
 
 from django.core.files.base import File
 
 from dbbackup import settings, utils
-
-from . import exceptions
+from dbbackup.db import exceptions
 
 logger = logging.getLogger("dbbackup.command")
 logger.setLevel(logging.DEBUG)
@@ -69,7 +69,7 @@ class BaseDBConnector:
     """
 
     extension = "dump"
-    exclude = []
+    exclude: ClassVar[list[Any]] = []
 
     def __init__(self, database_name=None, **kwargs):
         from django.db import DEFAULT_DB_ALIAS, connections
@@ -98,7 +98,8 @@ def _create_dump(self):
         """
         Override this method to define dump creation.
         """
-        raise NotImplementedError("_create_dump not implemented")
+        msg = "_create_dump not implemented"
+        raise NotImplementedError(msg)
 
     def restore_dump(self, dump):
         """
@@ -113,7 +114,8 @@ def _restore_dump(self, dump):
         :param dump: Dump file
         :type dump: file
         """
-        raise NotImplementedError("_restore_dump not implemented")
+        msg = "_restore_dump not implemented"
+        raise NotImplementedError(msg)
 
 
 class BaseCommandDBConnector(BaseDBConnector):
@@ -127,9 +129,9 @@ class BaseCommandDBConnector(BaseDBConnector):
     restore_suffix = ""
 
     use_parent_env = True
-    env = {}
-    dump_env = {}
-    restore_env = {}
+    env: ClassVar[dict[str, Any]] = {}
+    dump_env: ClassVar[dict[str, Any]] = {}
+    restore_env: ClassVar[dict[str, Any]] = {}
 
     def run_command(self, command, stdin=None, env=None):
         """
@@ -180,7 +182,8 @@ def run_command(self, command, stdin=None, env=None):
             process.wait()
             if process.poll():
                 stderr.seek(0)
-                raise exceptions.CommandConnectorError(f"Error running: {command}\n{stderr.read().decode('utf-8')}")
+                msg = f"Error running: {command}\n{stderr.read().decode('utf-8')}"
+                raise exceptions.CommandConnectorError(msg)
             return self._reset_streams(stdout, stderr)
 
         except OSError as err:
@@ -196,10 +199,11 @@ def run_command(self, command, stdin=None, env=None):
                     f"Alternatively, you can specify custom command paths using these settings:\n"
                     f"- DUMP_CMD: Path to the dump command\n"
                     f"- RESTORE_CMD: Path to the restore command\n\n"
-                    f"Original error: {str(err)}"
+                    f"Original error: {err!s}"
                 )
                 raise exceptions.CommandConnectorError(error_msg) from err
-            raise exceptions.CommandConnectorError(f"Error running: {command}\n{str(err)}") from err
+            msg = f"Error running: {command}\n{err!s}"
+            raise exceptions.CommandConnectorError(msg) from err
 
     def _env_shim(self, stdout, stderr, env):
         result_env = {}

dbbackup/db/django.py

@@ -13,7 +13,7 @@
 
 from django.core.management import call_command
 
-from .base import BaseDBConnector
+from dbbackup.db.base import BaseDBConnector
 
 
 class DjangoConnector(BaseDBConnector):

dbbackup/db/mongodb.py

@@ -1,6 +1,6 @@
 import shlex
 
-from .base import BaseCommandDBConnector
+from dbbackup.db.base import BaseCommandDBConnector
 
 
 class MongoDumpConnector(BaseCommandDBConnector):

dbbackup/db/mysql.py

@@ -1,6 +1,6 @@
 import shlex
 
-from .base import BaseCommandDBConnector
+from dbbackup.db.base import BaseCommandDBConnector
 
 
 class MysqlDumpConnector(BaseCommandDBConnector):

dbbackup/db/postgresql.py

@@ -2,10 +2,10 @@
 
 import logging
 import shlex
-from typing import Any, List, Optional
+from typing import Any, ClassVar
 from urllib.parse import quote
 
-from .base import BaseCommandDBConnector
+from dbbackup.db.base import BaseCommandDBConnector
 
 logger = logging.getLogger("dbbackup.command")
 
@@ -50,7 +50,7 @@ class PgDumpConnector(BaseCommandDBConnector):
     single_transaction = True
     drop = True
     if_exists = True
-    schemas: Optional[List[str]] = []
+    schemas: ClassVar[list[str] | None] = []
 
     def _create_dump(self):
         cmd_part, pg_env = parse_postgres_settings(self)

dbbackup/db/sqlite.py

@@ -8,7 +8,7 @@
 
 from django.db import IntegrityError, OperationalError
 
-from .base import BaseDBConnector
+from dbbackup.db.base import BaseDBConnector
 
 DUMP_TABLES = """
 SELECT "name", "type", "sql"
@@ -55,7 +55,7 @@ def _write_dump(self, fileobj):
 
         # Dump indexes, triggers, and views after all tables are created
         cursor.execute(DUMP_ETC)
-        for name, _, sql in cursor.fetchall():
+        for _name, _, sql in cursor.fetchall():
             if sql.startswith("CREATE INDEX"):
                 sql = sql.replace("CREATE INDEX", "CREATE INDEX IF NOT EXISTS", 1)
             elif sql.startswith("CREATE TRIGGER"):
@@ -129,9 +129,7 @@ def restore_dump(self, dump):
 
     @staticmethod
     def _should_suppress_error(msg: str):
-        return (msg.startswith("index") or msg.startswith("trigger") or msg.startswith("view")) and msg.endswith(
-            "already exists"
-        )
+        return (msg.startswith(("index", "trigger", "view"))) and msg.endswith("already exists")
 
 
 class SqliteCPConnector(BaseDBConnector):

dbbackup/log.py

@@ -5,14 +5,14 @@
 
 class DbbackupAdminEmailHandler(AdminEmailHandler):
     def send_mail(self, subject, message, *args, **kwargs):
-        from . import utils
+        from dbbackup import utils
 
         utils.mail_admins(subject, message, *args, connection=self.connection(), **kwargs)
 
 
 class MailEnabledFilter(logging.Filter):
     def filter(self, record):
-        from .settings import SEND_EMAIL
+        from dbbackup.settings import SEND_EMAIL
 
         return SEND_EMAIL
 

dbbackup/management/commands/_base.py

@@ -8,7 +8,7 @@
 
 from django.core.management.base import BaseCommand, CommandError
 
-from ...storage import StorageError
+from dbbackup.storage import StorageError
 
 USELESS_ARGS = ("callback", "callback_args", "callback_kwargs", "metavar")
 TYPES = {
@@ -20,7 +20,7 @@
     "choice": list,
 }
 LOGGING_VERBOSITY = {
-    0: logging.WARN,
+    0: logging.WARNING,
     1: logging.INFO,
     2: logging.DEBUG,
     3: logging.DEBUG,
@@ -86,7 +86,7 @@ def write_to_storage(self, file, path):
 
     def read_local_file(self, path):
         """Open file in read mode on local filesystem."""
-        return open(path, "rb")
+        return open(path, "rb")  # noqa: SIM115
 
     def write_local_file(self, outputfile, path):
         """Write file to the desired path."""

dbbackup/management/commands/dbbackup.py

@@ -4,50 +4,28 @@
 
 from django.core.management.base import CommandError
 
-from ... import settings, utils
-from ...db.base import get_connector
-from ...signals import pre_backup, post_backup
-from ...storage import StorageError, get_storage
-from ._base import BaseDbBackupCommand, make_option
+from dbbackup import settings, utils
+from dbbackup.db.base import get_connector
+from dbbackup.management.commands._base import BaseDbBackupCommand, make_option
+from dbbackup.signals import post_backup, pre_backup
+from dbbackup.storage import StorageError, get_storage
 
 
 class Command(BaseDbBackupCommand):
     help = "Backup a database, encrypt and/or compress."
     content_type = "db"
 
-    option_list = BaseDbBackupCommand.option_list + (
+    option_list = (
+        *BaseDbBackupCommand.option_list,
         make_option(
-            "-c",
-            "--clean",
-            dest="clean",
-            action="store_true",
-            default=False,
-            help="Clean up old backup files",
+            "-c", "--clean", dest="clean", action="store_true", default=False, help="Clean up old backup files"
         ),
         make_option(
-            "-d",
-            "--database",
-            help="Database(s) to backup specified by key separated by commas(default: all)",
-        ),
-        make_option(
-            "-s",
-            "--servername",
-            help="Specify server name to include in backup filename",
-        ),
-        make_option(
-            "-z",
-            "--compress",
-            action="store_true",
-            default=False,
-            help="Compress the backup files",
-        ),
-        make_option(
-            "-e",
-            "--encrypt",
-            action="store_true",
-            default=False,
-            help="Encrypt the backup files",
+            "-d", "--database", help="Database(s) to backup specified by key separated by commas(default: all)"
         ),
+        make_option("-s", "--servername", help="Specify server name to include in backup filename"),
+        make_option("-z", "--compress", action="store_true", default=False, help="Compress the backup files"),
+        make_option("-e", "--encrypt", action="store_true", default=False, help="Encrypt the backup files"),
         make_option("-o", "--output-filename", default=None, help="Specify filename on storage"),
         make_option(
             "-O",