Modernise

Author: layday

cataloguer.py

@@ -9,7 +9,7 @@
 import os
 import re
 from collections import defaultdict
-from collections.abc import Iterable, Iterator, Mapping, Sequence
+from collections.abc import Iterable, Mapping, Sequence
 from contextlib import (
     AbstractAsyncContextManager,
     AsyncExitStack,
@@ -289,7 +289,7 @@ def is_valid_toc(toc_filename: str):
             )
             for t in tocs
         )
-        toc_ids_by_source: Iterator[tuple[str, ...]] = zip(*toc_ids)
+        toc_ids_by_source: zip[tuple[str, ...]] = zip(*toc_ids)
         project_ids = (next(filter(None, s), None) for s in toc_ids_by_source)
 
     else:
@@ -518,7 +518,9 @@ async def get_projects(token: str):
         return projects
 
 
-async def get_pruned_or_updates_projects(token: str, prune_candidates: Iterable[str]):
+async def get_pruned_or_updates_projects(
+    token: str, prune_candidates: Iterable[str]
+) -> Mapping[str, Project | Literal[False]]:
     async with _make_http_client(token) as (_, get):
 
         async def get_repo(candidate: str):
@@ -529,12 +531,11 @@ async def get_repo(candidate: str):
             except aiohttp.ClientResponseError:
                 return (candidate, False)
 
-        repo_statuses: dict[str, Project | Literal[False]] = {
+        return {
             f: s
-            for c in asyncio.as_completed([get_repo(f) for f in prune_candidates])
+            for c in asyncio.as_completed(get_repo(f) for f in prune_candidates)
             for (f, s) in (await c,)
         }
-        return repo_statuses
 
 
 outcsv_argument = click.argument("outcsv", default="addons.csv")

noxfile.py

@@ -0,0 +1,17 @@
+import nox
+
+nox.options.default_venv_backend = "uv"
+nox.options.sessions = ["lint"]
+
+
+@nox.session(name="format")
+def format_(session):
+    session.install("--group", "format")
+    session.run("ruff", "check", "--select", "I", "--fix")
+    session.run("ruff", "format")
+
+
+@nox.session
+def lint(session):
+    session.install("--group", "lint")
+    session.run("ruff", "check")

pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "flit_core.buildapi"
 name = "cataloguer"
 version = "0.1.0"
 description = "Script which collects WoW add-on metadata from GitHub"
-requires-python = ">= 3.11"
+requires-python = ">= 3.12"
 license.file = "LICENSE"
 dependencies = [
   "aiohttp",
@@ -19,45 +19,34 @@ dependencies = [
   "yarl",
 ]
 
-[project.optional-dependencies]
-dev = [
-  "poethepoet",
-  "ruff",
-]
-
-[project.entry-points."pipx.run"]
-cataloguer = "cataloguer:cli"
-
-[tool.pyright]
-strict = ["cataloguer.py"]
+[dependency-groups]
+dev = ["basedpyright", { include-group = "lint" }, { include-group = "typing" }]
+format = ["ruff"]
+lint = [{ include-group = "format" }]
+typing = ["diskcache-stubs"]
 
 [tool.ruff]
 line-length = 99
 
 [tool.ruff.lint]
 select = [
-  "A",    # flake8-builtins
-  "B0",   # flake8-bugbear excl. opinionated rules
-  "C4",   # flake8-comprehensions
-  "DTZ",  # flake8-datetimez
-  "E",    # pycodestyle
-  "F",    # pyflakes
-  "I",    # isort
-  "PGH",  # pygrep-hooks
-  "PIE",  # flake8-pie
-  "RUF",  # ruff
-  "UP",   # pyupgrade
-  "W",    # pycodestyle
+  "ASYNC", # flake8-async
+  "B0",    # flake8-bugbear (without opinionated rules)
+  "C4",    # flake8-comprehensions
+  "DTZ",   # flake8-datetimez
+  "E",     # pycodestyle
+  "F",     # pyflakes
+  "I",     # isort
+  "PGH",   # pygrep-hooks
+  "PIE",   # flake8-pie
+  "PT",    # flake8-pytest-style
+  "RUF",   # ruff
+  "TRY",   # tryceratops
+  "UP",    # pyupgrade
+  "W",     # pycodestyle
+  "YTT",   # flake8-2020
 ]
 
-[tool.poe.env]
-__POE_TARGET = "cataloguer.py"
-
-[tool.poe.tasks]
-_black = "ruff format $__POE_TARGET"
-_isort = "ruff --select I --fix $__POE_TARGET"
-format.sequence = [
-  "_black",
-  "_isort",
-]
-lint = "ruff --output-format grouped --show-source $__POE_TARGET"
+[tool.pyright]
+typeCheckingMode = "strict"
+# strict = ["cataloguer.py"]

taplo.toml

@@ -0,0 +1,4 @@
+[formatting]
+array_auto_collapse = false
+column_width = 99
+indent_string = "  "