Update project configuration and dependencies; remove .flake8 and .setup.cfg, add new settings in pyproject.toml, and adjust .editorconfig for improved code style. Update Python version to 3.12 and version to 4.0.0. Enhance signal handling in signals.py and implement encryption/decryption functions in util.py.

Author: joeblackwaslike

.editorconfig

@@ -1,13 +1,34 @@
+# EditorConfig is awesome: https://editorconfig.org
+
+# top-most EditorConfig file
 root = true
+max_line_length = 100
+
 
+# Unix-style newlines with a newline ending every file
 [*]
 indent_style = space
 indent_size = 4
 insert_final_newline = true
 trim_trailing_whitespace = true
 end_of_line = lf
 charset = utf-8
-max_line_length = 88
 
-[*.{yml,yaml,json,js,css,html}]
+[*.md]
+trim_trailing_whitespace = false
+
+
+# 2 space indentation
+[*.{yml,yaml,css,html}]
 indent_size = 2
+
+
+[*.py]
+indent_style = space
+indent_size = 4
+
+# Tab indentation (no size specified)
+[Makefile]
+indent_style = tab
+tab_width = 4
+

.flake8

@@ -21,4 +21,4 @@ pytest-plugin-work
 old
 examples/two/
 *.sqlite
-*.db
+*.db

.gitignore

@@ -1 +1 @@
-3.7.13
+3.12.2

.python-version

@@ -1,6 +1,6 @@
 [project]
 name = "quart-sqlalchemy"
-version = "3.0.2"
+version = "4.0.0"
 description = "SQLAlchemy for humans, with framework adapter for Quart."
 authors = [
     {name = "Joe Black", email = "me@joeblack.nyc"},
@@ -11,13 +11,17 @@ dependencies = [
     "SQLAlchemy-Utils",
     "anyio",
     "aiosqlite",
+    "bases",
+    "blinker",
+    "cryptography",
     "pydantic",
     "tenacity",
+    "reedsolo",
     "sqlapagination",
-    "exceptiongroup",
+    "simonspeckciphers",
     "python-ulid"
 ]
-requires-python = ">=3.7"
+requires-python = ">=3.12"
 readme = "README.rst"
 license = {text = "MIT"}
 
@@ -29,6 +33,8 @@ license = {text = "MIT"}
 requires = ["setuptools", "setuptools-scm"]
 build-backend = "setuptools.build_meta"
 
+[tool.setuptools]
+py-modules = ["src"]
 
 [project.optional-dependencies]
 sim = [
@@ -37,7 +43,6 @@ sim = [
 tests = [
     "pytest",
     # "pytest-asyncio~=0.20.3",
-    # "pytest-asyncio @ https://github.com/joeblackwaslike/pytest-asyncio/releases/download/v0.20.4.dev42/pytest_asyncio-0.20.4.dev42-py3-none-any.whl",
     "pytest-asyncio @ https://github.com/joeblackwaslike/pytest-asyncio/releases/download/v0.20.4.dev43/pytest_asyncio-0.20.4.dev43-py3-none-any.whl",
     "pytest-mock",
     "pytest-cov",
@@ -46,35 +51,22 @@ tests = [
 dev = [
     "pre-commit",
     "tox",
-    "tox-pdm",
     "mypy",
-    "wemake-python-styleguide",
-    "IPython",
-    "black",
+    "ipython",
+    "ruff",
 ]
+
 docs = [
     "sphinx",
     "pallets-sphinx-themes",
     "sphinx-issues",
     "sphinxcontrib-log-cabinet",
 ]
 
-[tool.pdm.build]
-source-includes = [
-    "docs/",
-    # "examples/",
-    "tests/",
-    "CHANGES.rst",
-    "pdm.lock",
-    "tox.ini",
-]
-excludes = [
-    "docs/_build",
-]
-
 [tool.pytest.ini_options]
 addopts = "-rsx --tb=short --loop-scope session"
 testpaths = ["tests"]
+pythonpath = ["src"]
 filterwarnings = ["error"]
 asyncio_mode = "auto"
 py311_task = true
@@ -85,23 +77,104 @@ branch = true
 source = ["src", "tests"]
 
 [tool.coverage.paths]
-source = ["src", "*/site-packages"]
-
-[tool.isort]
-profile = "black"
-src_paths = ["src", "tests", "examples"]
-force_single_line = true
-use_parentheses = true
-atomic = true
-lines_after_imports = 2
-line_length = 100
-order_by_type = false
-known_first_party = ["quart_sqlalchemy", "tests"]
+source = ["src"]
+
+
+[tool.ruff]
+# Ruff config: https://docs.astral.sh/ruff/settings
+target-version = "py312"
+line-length = 100
+fix = true
+
+[tool.ruff.lint]
+select = [
+    "A",    # flake8-builtins
+    "B",    # flake8-bugbear
+    "C4",   # flake8-comprehensions
+    "C90",  # maccabe
+    "COM",  # flake8-commas
+    "D",    # pydocstyle
+    "DTZ",  # flake8-datetimez
+    "E",    # pycodestyle
+    "ERA",  # flake8-eradicate
+    "EXE",  # flake8-executable
+    "F",    # pyflakes
+    "FBT",  # flake8-boolean-trap
+    "FLY",  # pyflint
+    "FURB", # refurb
+    "G",    # flake8-logging-format
+    "I",    # isort
+    "ICN",  # flake8-import-conventions
+    "ISC",  # flake8-implicit-str-concat
+    "LOG",  # flake8-logging
+    "N",    # pep8-naming
+    "PERF", # perflint
+    "PIE",  # flake8-pie
+    "PL",   # pylint
+    "PT",   # flake8-pytest-style
+    "PTH",  # flake8-use-pathlib
+    "Q",    # flake8-quotes
+    "RET",  # flake8-return
+    "RSE",  # flake8-raise
+    "RUF",  # ruff
+    "S",    # flake8-bandit
+    "SIM",  # flake8-simpify
+    "SLF",  # flake8-self
+    "SLOT", # flake8-slots
+    "T100", # flake8-debugger
+    "TRY",  # tryceratops
+    "UP",   # pyupgrade
+    "W",    # pycodestyle
+    "YTT",  # flake8-2020
+]
+ignore = [
+    "A005",   # allow to shadow stdlib and builtin module names
+    "COM812", # trailing comma, conflicts with `ruff format`
+    # Different doc rules that we don't really care about:
+    "D100",
+    "D104",
+    "D106",
+    "D203",
+    "D212",
+    "D401",
+    "D404",
+    "D405",
+    "E501",    # line too long
+    "E731",    # do not assign lambda
+    "ISC001",  # implicit string concat conflicts with `ruff format`
+    "ISC003",  # prefer explicit string concat over implicit concat
+    "PLR09",   # we have our own complexity rules
+    "PLR2004", # do not report magic numbers
+    "PLR6301", # do not require classmethod / staticmethod when self not used
+    "TRY003",  # long exception messages from `tryceratops`
+]
+
+# Plugin configs:
+flake8-import-conventions.banned-from = [ "ast" ]
+flake8-quotes.inline-quotes = "double"
+mccabe.max-complexity = 6
+pydocstyle.convention = "google"
+
+[tool.ruff.lint.per-file-ignores]
+"tests/*.py" = [
+  "S101", # asserts
+  "S105", # hardcoded passwords
+  "S404", # subprocess calls are for tests
+  "S603", # do not require `shell=True`
+  "S607", # partial executable paths
+  "D103", # docstrings on public functions
+]
+
+[tool.ruff.format]
+preview = true
+quote-style = "double"
+indent-style = "space"
+docstring-code-format = false
 
 [tool.mypy]
-python_version = "3.7"
+python_version = "3.12"
 plugins = ["pydantic.mypy", "sqlalchemy.ext.mypy.plugin"]
-files = ["src/quart_sqlalchemy", "tests"]
+files = ["src", "tests"]
 show_error_codes = true
 pretty = true
 strict = true
@@ -120,81 +193,3 @@ module = [
 ]
 ignore_missing_imports = true
 
-[tool.pylint.messages_control]
-max-line-length = 100
-disable = ["invalid-name", "missing-docstring", "protected-access"]
-
-[tool.flakeheaven]
-baseline = ".flakeheaven_baseline"
-exclude = ["W503"]
-
-[tool.flakeheaven.plugins]
-"flake8-*" = ["+*"]
-"flake8-docstrings" = [
-    "+*",
-    "-D100",
-    "-D101",
-    "-D102",
-    "-D103",
-    "-D106",
-    "-D107",
-    "-D401",
-]
-"flake8-quotes" = [
-    "+*",
-    "-Q000",
-]
-"flake8-isort" = [
-    "+*",
-    "-I001",
-    "-I003",
-    "-I005",
-]
-"flake8-bandit" = [
-    "+*",
-    "-S101",
-]
-"mccabe" = ["+*"]
-"pycodestyle" = ["+*"]
-"pyflakes" = [
-    "+*",
-]
-"wemake-python-styleguide" = [
-    "+*",
-    "-WPS110",
-    "-WPS111",
-    "-WPS115",
-    "-WPS118",
-    "-WPS120",  # allow variables with trailing underscore
-    "-WPS201",
-    "-WPS204",
-    "-WPS210",
-    "-WPS211",
-    "-WPS214",
-    "-WPS221",
-    "-WPS224",
-    "-WPS225",  # allow multiple except in try block
-    "-WPS226",
-    "-WPS230",
-    "-WPS231",
-    "-WPS232",
-    "-WPS238",  # allow multiple raises in function
-    "-WPS305",  # allow f-strings
-    "-WPS306",
-    "-WPS326",
-    "-WPS337",  # allow multi-line conditionals
-    "-WPS338",
-    "-WPS420",  # allow pass keyword
-    "-WPS429",
-    "-WPS430",  # allow nested functions
-    "-WPS431",
-    "-WPS432",
-    "-WPS433",
-    "-WPS435",
-    "-WPS437",
-    "-WPS463",  # Unsure what it means "Found a getter without a return value"
-    "-WPS473",
-    "-WPS503",
-    "-WPS505",
-    "-WPS604",  # allow pass inside 'class' body
-]