Consolidate linting rules, switch to Ruff in CI (#157)

Author: elprans

.github/workflows/lint.yml

@@ -17,13 +17,16 @@ jobs:
         # because typing of stdlib might be different.
         os: [ubuntu-latest, windows-latest]
     runs-on: ${{ matrix.os }}
+    permissions: {}
     steps:
       - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
       - uses: actions/setup-python@v5
         with:
           python-version: "3.12"
-      - uses: psf/black@stable
-      - uses: python/mypy@master
+      - uses: astral-sh/ruff-action@9828f49eb4cadf267b40eaa330295c412c68c1f9 # 3.2.2
+      - uses: python/mypy@9397454fb5aead107461b089e7cf190bf538d20a # 1.5.0
         with:
           install_types: no
           paths: edgedbpkg

.gitignore

@@ -24,5 +24,6 @@ docs/_build
 /.coverage*
 !/.coveragerc
 /.vscode
-/.mypy_cache
+.mypy_cache
+.ruff_cache
 /.venv

pyproject.toml

@@ -2,7 +2,7 @@
 name = "edgedb-pkg"
 dynamic = ["version"]
 requires-python = '>=3.12.0'
-dependencies = ["metapkg@git+https://github.com/edgedb/metapkg.git"]
+dependencies = ["metapkg@git+https://github.com/geldata/metapkg.git"]
 
 [build-system]
 requires = ["setuptools>=64", "setuptools-scm>=8"]
@@ -11,9 +11,11 @@ build-backend = "setuptools.build_meta"
 [project.optional-dependencies]
 dev = ['black', 'ruff', 'mypy']
 server = [
-    "boto3-stubs[boto3,s3] ~= 1.35.40",
-    "python-debian ~= 0.1.49",
-    "semver ~= 3.0.2",
+    "boto3-stubs[boto3,s3] ~= 1.37",
+    "click ~= 8.0",
+    "filelock ~= 3.18",
+    "python-debian ~= 1.0",
+    "semver ~= 3.0",
 ]
 
 [tool.setuptools]
@@ -32,9 +34,7 @@ exclude = [".github"]
 
 [tool.mypy]
 files = ["edgedbpkg", "server/process_incoming.py"]
-
 python_version = "3.12"
-ignore_missing_imports = true
 show_error_codes = true
 strict = true
 namespace_packages = true

server/README.rst

@@ -21,13 +21,13 @@
 import tarfile
 import tempfile
 import textwrap
+import tomllib
 
-import boto3
-import boto3.session
+import boto3  # type: ignore [import-untyped]
+import boto3.session  # type: ignore [import-untyped]
 import click
 import filelock
 import semver
-import tomli
 
 from debian import debian_support
 
@@ -119,7 +119,8 @@ class Version(TypedDict):
 
 
 def subprocess_run(
-    *args: Any, **kwargs: Any,
+    *args: Any,
+    **kwargs: Any,
 ) -> subprocess.CompletedProcess[str]:
     kw = dict(kwargs)
     if kw.get("stdout") is None and not kw.get("capture_output"):
@@ -257,7 +258,7 @@ def format_version_key(ver: Version, revision: str) -> str:
         # or debian version comparison algorithm.
         prerelease = (
             ("~" if pre["phase"] == "dev" else ".")
-            + f'{pre["phase"]}.{pre["number"]}'
+            + f"{pre['phase']}.{pre['number']}"
             for pre in ver["prerelease"]
         )
         ver_key += "~" + "".join(prerelease).lstrip(".~")
@@ -314,7 +315,8 @@ def remove_old(
             build_date = datetime.datetime.fromisoformat(build_date_str)
         else:
             build_date = datetime.datetime.fromtimestamp(
-                0, tz=datetime.UTC,
+                0,
+                tz=datetime.UTC,
             )
         ver_key = (version, build_date)
         index.setdefault(key, {}).setdefault(ver_key, []).append(obj.key)
@@ -568,7 +570,7 @@ def main(
     upload_listing: str,
 ) -> None:
     with open(config, "rb") as cf:
-        cfg = cast(Config, tomli.load(cf))
+        cfg = cast(Config, tomllib.load(cf))
         if "common" not in cfg:
             raise ValueError("missing required [common] section in config")
         if not cfg["common"].get("buckets"):
@@ -1324,7 +1326,8 @@ def process_rpm(
             pkgmetadata["name"] = basename
 
         version_key = format_version_key(
-            pkgmetadata["version_details"], pkgmetadata["revision"],
+            pkgmetadata["version_details"],
+            pkgmetadata["revision"],
         )
 
         slot_name = pkgmetadata["name"]
@@ -1355,10 +1358,10 @@ def process_rpm(
         comp = functools.cmp_to_key(debian_support.version_compare)
         for _slot_name, versions in slot_index.items():
             sorted_versions = sorted(
-                    versions,
-                    key=lambda v: comp(v[0]),
-                    reverse=True,
-                )
+                versions,
+                key=lambda v: comp(v[0]),
+                reverse=True,
+            )
 
             for ver_key, name, ver_nevra, arch in sorted_versions[3:]:
                 logger.info(f"process_rpm: deleting outdated {ver_nevra}")

server/process_incoming.py

@@ -1,49 +1,5 @@
-[project]
-name = "process_incoming"
-description = "Universal package processor"
-authors = [{ name = "Gel Data Inc", email = "hello@geldata.com" }]
-requires-python = ">=3.12"
-readme = "README.rst"
-version = "1.0.0"
-dependencies = [
-    'boto3',
-    'mypy-boto3-s3',
-    'click',
-    'typing-extensions',
-    'tomli',
-    'semver',
-    'filelock',
-    'python-debian',
-]
-
-[project.urls]
-github = "https://github.com/geldata/gel-pkg/"
-
-[project.scripts]
-process_incoming = "process_incoming:main"
-
-[build-system]
-requires = ["setuptools>=59", "wheel"]
-build-backend = "setuptools.build_meta"
-
-[tool.setuptools]
-py-modules = ["process_incoming"]
-
-[tool.black]
-line-length = 79
-target-version = ["py312"]
-
-[tool.mypy]
-files = "process_incoming.py"
-python_version = "3.12"
-ignore_missing_imports = true
-show_error_codes = true
-strict = true
-
 [tool.ruff]
-line-length = 79
-indent-width = 4
-target-version = "py312"
+extend = "../pyproject.toml"
 
 [tool.ruff.lint]
 preview = true
@@ -66,3 +22,4 @@ extend-select = [
     "UP",    # pyupgrade
     "W",     # warning
 ]
+ignore = ["COM812"]