Update to poetry 2.0

Author: MrThearMan

.github/workflows/docs.yml

@@ -13,3 +13,5 @@ on:
 jobs:
   docs:
     uses: MrThearMan/CI/.github/workflows/[email protected]
+    with:
+      poetry-version: "2.0.0"

.github/workflows/release.yml

@@ -10,3 +10,5 @@ jobs:
     uses: MrThearMan/CI/.github/workflows/[email protected]
     secrets:
       pypi-token: ${{ secrets.PYPI_API_TOKEN }}
+    with:
+      poetry-version: "2.0.0"

.github/workflows/test.yml

@@ -17,3 +17,4 @@ jobs:
     uses: MrThearMan/CI/.github/workflows/[email protected]
     with:
       python-version: '["3.10", "3.11", "3.12", "3.13"]'
+      poetry-version: "2.0.0"

.pre-commit-config.yaml

@@ -20,13 +20,13 @@ repos:
             ]
 
 -   repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.8.4
+    rev: v0.9.0
     hooks:
     -   id: ruff
     -   id: ruff-format
 
 -   repo: https://github.com/python-poetry/poetry
-    rev: 1.8.0
+    rev: 2.0.0
     hooks:
     -   id: poetry-check
     -   id: poetry-lock

Makefile

@@ -11,7 +11,6 @@ export DJANGO_SETTINGS_MODULE = example_project.config.settings
 .PHONY: lint
 .PHONY: migrate
 .PHONY: migrations
-.PHONY: mypy
 .PHONY: profile
 .PHONY: setup
 .PHONY: test
@@ -39,7 +38,6 @@ define helptext
   lint                 Run pre-commit hooks on all files.
   migrate              Migrate database.
   migrations           Make migrations.
-  mypy                 Run mypy on all files.
   profile <pid>        Run py-spy for a given PID.
   setup                Make migrations, apply them, and add a superuser
   test <name>          Run all tests maching the given <name>
@@ -81,9 +79,6 @@ migrate:
 migrations:
 	@poetry run python manage.py makemigrations
 
-mypy:
-	@poetry run mypy query_optimizer/
-
 profile:
 	@poetry run py-spy record -o profile.svg --pid $(call args, "")
 

example_project/app/utils.py

@@ -54,7 +54,7 @@ def log(self) -> str:
 
         query: str
         summary: str
-        for index, (query, summary) in enumerate(zip(self.queries, self.stacks)):
+        for index, (query, summary) in enumerate(zip(self.queries, self.stacks, strict=False)):
             message += f"{index + 1})"
             message += "\n\n"
             message += "--- Query ".ljust(75, "-")

example_project/config/logging.py

@@ -1,7 +1,8 @@
 import logging
 import traceback
+from collections.abc import Callable
 from pathlib import Path
-from typing import Any, Callable
+from typing import Any
 
 logger = logging.getLogger(__name__)
 

poetry.lock

@@ -1,18 +1,12 @@
-[tool.poetry]
+[project]
 name = "graphene-django-query-optimizer"
 version = "0.10.5"
 description = "Automatically optimize SQL queries in Graphene-Django schemas."
 authors = [
-    "Matti Lamppu <[email protected]>",
-]
-packages = [
-    { include = "query_optimizer" },
+    { name = "Matti Lamppu", email = "[email protected]" },
 ]
 license = "MIT"
 readme = "README.md"
-homepage = "https://mrthearman.github.io/graphene-django-query-optimizer"
-repository = "https://github.com/MrThearMan/graphene-django-query-optimizer"
-documentation = "https://mrthearman.github.io/graphene-django-query-optimizer"
 keywords = [
     "django",
     "graphene",
@@ -39,48 +33,49 @@ classifiers = [
     "Framework :: Django :: 5.0",
     "Framework :: Django :: 5.1",
 ]
-include = [
-    "README.md",
-    "LICENSE",
-]
-exclude = [
-    "tests",
+requires-python = ">=3.10,<4"
+dynamic = [
+    "dependencies",
 ]
 
-[tool.poetry.urls]
+[project.urls]
+"Homepage" = "https://mrthearman.github.io/graphene-django-query-optimizer"
+"Repository" = "https://github.com/MrThearMan/graphene-django-query-optimizer"
 "Bug Tracker" = "https://github.com/MrThearMan/graphene-django-query-optimizer/issues"
+"Documentation" = "https://mrthearman.github.io/graphene-django-query-optimizer"
+
+[tool.poetry]
+requires-poetry = ">=2.0.0"
+packages = [
+    { include = "query_optimizer" },
+]
 
 [tool.poetry.dependencies]
-python = ">=3.10,<4"
 Django = ">=4.2"
 graphene-django = ">=3.0.0"
 django-settings-holder = ">=0.1.2"
 django-filter = { version = ">=21.1", optional = true }
 
-[tool.poetry.extras]
-filter = ["django-filter"]
-
 [tool.poetry.group.test.dependencies]
 pytest = "8.3.4"
 coverage = "7.6.10"
 pytest-django = "4.9.0"
 tox = "4.23.2"
 tox-gh-actions = "3.2.0"
-faker = "33.3.0"
+faker = "33.3.1"
 factory-boy = "3.3.1"
 sqlparse = "0.5.3"
 django-graphiql-debug-toolbar = "0.2.0"
 py-spy = "0.4.0"
+django-filter = "24.3"
 
 [tool.poetry.group.docs.dependencies]
 mkdocs = "1.6.1"
-pymdown-extensions = "10.13"
+pymdown-extensions = "10.14"
 mkdocs-mermaid2-plugin = "1.2.1"
 
 [tool.poetry.group.lint.dependencies]
-mypy = "1.14.1"
 pre-commit = "4.0.1"
-django-stubs = "5.1.1"
 
 [tool.ruff]
 fix = true
@@ -167,6 +162,7 @@ lint.extend-select = [
     "UP042",    # replace-str-enum
 ]
 lint.ignore = [
+    "A005",     # Allow shadowing builtin modules
     "ANN401",   # Any-typing allowed
     "ARG002",   # Unused method argument
     "ARG003",   # Unused class method argument
@@ -268,18 +264,6 @@ extend-ignore-names = [
 [tool.ruff.lint.pylint]
 max-args = 7
 
-[tool.mypy]
-python_version = "3.13"
-warn_return_any = true
-warn_unused_configs = true
-ignore_missing_imports = true
-plugins = [
-    "mypy_django_plugin.main",
-]
-
-[tool.django-stubs]
-django_settings_module = "example_project.config.settings"
-
 [tool.coverage.run]
 relative_files = true
 

pyproject.toml

@@ -200,7 +200,7 @@ def paginate_prefetch_queryset(self, queryset: QuerySet, filter_info: GraphQLFil
         remote_field = field.remote_field
         field_name = (
             remote_field.name  # .
-            if isinstance(field, (models.ManyToManyField, GenericRelation))
+            if isinstance(field, models.ManyToManyField | GenericRelation)
             else remote_field.attname
         )