fixed-fmt-linted

pyproject.toml

@@ -1,12 +1,8 @@
-[build-system]
-requires = ["poetry-core>=1.0.0"]
-build-backend = "poetry.core.masonry.api"
-
 [tool.poetry]
 name = "discoursio-notifier"
-version = "0.2.19"
+version = "0.3.0"
 description = "notifier server for discours.io"
-authors = ["discours.io devteam"]
+authors = ["Tony Rewin <anton.rewin@gmail.com>"]
 
 [tool.poetry.dependencies]
 python = "^3.12"
@@ -21,48 +17,68 @@ granian = "^1.0.2"
 
 [tool.poetry.group.dev.dependencies]
 setuptools = "^69.0.2"
-pytest = "^7.4.2"
-black = { version = "^23.12.0", python = ">=3.12" }
-ruff = { version = "^0.1.15", python = ">=3.12" }
-mypy = { version = "^1.7", python = ">=3.12" }
 isort = "^5.13.2"
 pyright = "^1.1.341"
-pre-commit = "^3.6.0"
-pytest-asyncio = "^0.23.4"
-pytest-cov = "^4.1.0"
+mypy = "^1.7.1"
+ruff = "^0.1.15"
+black = "^23.12.0"
+pytest = "^7.4.3"
+
+[build-system]
+requires = ["poetry-core"]
+build-backend = "poetry.core.masonry.api"
+
+[tool.ruff]
+line-length = 120
+extend-select = [
+    # E and F are enabled by default
+    'B',      # flake8-bugbear
+    'C4',     # flake8-comprehensions
+    'C90',    # mccabe
+    'I',      # isort
+    'N',      # pep8-naming
+    'Q',      # flake8-quotes
+    'RUF100', # ruff (unused noqa)
+    'S',      # flake8-bandit
+    'W',      # pycodestyle
+]
+extend-ignore = [
+    'B008', # function calls in args defaults are fine
+    'B009', # getattr with constants is fine
+    'B034', # re.split won't confuse us
+    'B904', # rising without from is fine
+    'E501', # leave line length to black
+    'N818', # leave to us exceptions naming
+    'S101', # assert is fine
+    'RUF100', # black's noqa
+]
+flake8-quotes = { inline-quotes = 'single', multiline-quotes = 'double' }
+mccabe = { max-complexity = 13 }
+target-version = "py312"
+
+[tool.ruff.format]
+quote-style = 'single'
 
 [tool.black]
-line-length = 120
-target-version = ['py312']
-include = '\.pyi?$'
-exclude = '''
+skip-string-normalization = true
 
-(
-  /(
-      \.eggs         # exclude a few common directories in the
-    | \.git          # root of the project
-    | \.hg
-    | \.mypy_cache
-    | \.tox
-    | \.venv
-    | _build
-    | buck-out
-    | build
-    | dist
-  )/
-  | foo.py           # also separately exclude a file named foo.py in
-                     # the root of the project
-)
-'''
+[tool.ruff.isort]
+combine-as-imports = true
+lines-after-imports = 2
+known-first-party = ['resolvers', 'services', 'orm', 'tests']
 
-[tool.isort]
-multi_line_output = 3
-include_trailing_comma = true
-force_grid_wrap = 0
-use_parentheses = true
-ensure_newline_before_comments = true
-line_length = 120
+[tool.ruff.per-file-ignores]
+'tests/**' = ['B018', 'S110', 'S501']
 
+[tool.mypy]
+python_version = "3.12"
+warn_return_any = true
+warn_unused_configs = true
+ignore_missing_imports = true
+exclude = ["nb"]
+
+[tool.pytest.ini_options]
+asyncio_mode = 'auto'
 
 [tool.pyright]
 venvPath = "."
@@ -90,27 +106,3 @@ logLevel = "Information"
 pluginSearchPaths = []
 typings = {}
 mergeTypeStubPackages = false
-
-[tool.mypy]
-python_version = "3.12"
-warn_unused_configs = true
-plugins = ["mypy_sqlalchemy.plugin", "strawberry.ext.mypy_plugin"]
-
-[tool.ruff]
-# Enable Pyflakes (`F`) and a subset of the pycodestyle (`E`)  codes by default.
-# Unlike Flake8, Ruff doesn't enable pycodestyle warnings (`W`) or
-# McCabe complexity (`C901`) by default.
-select = ["E4", "E7", "E9", "F"]
-ignore = []
-line-length = 120
-target-version = "py312"
-
-
-
-[tool.pytest.ini_options]
-pythonpath = [
-  "."
-]
-
-[tool.pytest]
-python_files = "*_test.py"