Move metadata to pyproject.toml, fix lints

edgedbpkg/edgedb/__init__.py

@@ -14,7 +14,6 @@
 
 from metapkg import packages
 from metapkg import targets
-from metapkg import tools
 from metapkg.packages import python
 
 from edgedbpkg import postgresql

edgedbpkg/edgedb_ext/base.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 from typing import (
-    Any,
     TYPE_CHECKING,
 )
 

edgedbpkg/libb2/__init__.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-import pathlib
-
 from metapkg import packages
 from metapkg import targets
 

edgedbpkg/pgext/base.py

@@ -8,7 +8,6 @@
 import re
 import shlex
 
-from poetry.core.constraints import version as poetry_version
 from poetry.core.packages import dependency as poetry_dep
 
 from metapkg import packages

edgedbpkg/pgext/pgvector/__init__.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-from metapkg import packages
-
 from edgedbpkg import pgext
 
 

edgedbpkg/python/__init__.py

@@ -161,9 +161,9 @@ def get_build_script(self, build: targets.Build) -> str:
             exe_suffix = ""
 
         sitescript = (
-            f"import site; import pathlib; "
-            f"print(pathlib.Path( "
-            f'site.getsitepackages([\\"${{p}}\\"])[0]).resolve())'
+            "import site; import pathlib; "
+            "print(pathlib.Path( "
+            'site.getsitepackages([\\"${p}\\"])[0]).resolve())'
         )
 
         python = f"python{exe_suffix}"

pyproject.toml

@@ -1,15 +1,31 @@
+[project]
+name = "edgedb-pkg"
+dynamic = ["version"]
+requires-python = '>=3.12.0'
+dependencies = ["metapkg@git+https://github.com/edgedb/metapkg.git"]
+
+[build-system]
+requires = ["setuptools>=64", "setuptools-scm>=8"]
+build-backend = "setuptools.build_meta"
+
+[tool.setuptools]
+packages = { find = { include = ["edgedbpkg", "edgedbpkg.*"] } }
+zip-safe = false
+
 [tool.black]
 line-length = 79
-target-version = ["py39"]
+target-version = ["py312"]
 
 [tool.ruff]
+target-version = "py312"
 line-length = 79
 indent-width = 4
 exclude = [".github"]
 
 [tool.mypy]
-files = "edgedbpkg"
-python_version = "3.9"
+files = ["edgedbpkg", "server/process_incoming.py"]
+
+python_version = "3.12"
 ignore_missing_imports = true
 show_error_codes = true
 strict = true

server/process_incoming.py

@@ -1201,7 +1201,7 @@ def process_rpm(
 
         shutil.copy(incoming_dir / rpm, local_dist_dir / rpm)
 
-    logger.info(f"process_rpm: running `createrepo_c --update`")
+    logger.info("process_rpm: running `createrepo_c --update`")
     subprocess_run(
         [
             "createrepo_c",
@@ -1361,7 +1361,7 @@ def process_rpm(
                 need_db_update = True
 
     if need_db_update:
-        logger.info(f"process_rpm: running `createrepo_c --update` (again)")
+        logger.info("process_rpm: running `createrepo_c --update` (again)")
         subprocess_run(
             [
                 "createrepo_c",