Update project (#25)

hamdanal · web-flow · commit 6fd58d336181 · 2025-06-22T11:05:42.000+02:00
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -10,7 +10,7 @@ repos:
       - id: mixed-line-ending
       - id: check-case-conflict
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.11.10 # must match requirements.txt
+    rev: v0.12.0 # must match requirements.txt
     hooks:
       - id: ruff
       - id: ruff-format
diff --git a/stubs/psqlextra-stubs/backend/migrations/operations/__init__.pyi b/stubs/psqlextra-stubs/backend/migrations/operations/__init__.pyi
@@ -1,15 +1,33 @@
-from .add_default_partition import PostgresAddDefaultPartition as PostgresAddDefaultPartition
-from .add_hash_partition import PostgresAddHashPartition as PostgresAddHashPartition
-from .add_list_partition import PostgresAddListPartition as PostgresAddListPartition
-from .add_range_partition import PostgresAddRangePartition as PostgresAddRangePartition
-from .apply_state import ApplyState as ApplyState
-from .create_materialized_view_model import PostgresCreateMaterializedViewModel as PostgresCreateMaterializedViewModel
-from .create_partitioned_model import PostgresCreatePartitionedModel as PostgresCreatePartitionedModel
-from .create_view_model import PostgresCreateViewModel as PostgresCreateViewModel
-from .delete_default_partition import PostgresDeleteDefaultPartition as PostgresDeleteDefaultPartition
-from .delete_hash_partition import PostgresDeleteHashPartition as PostgresDeleteHashPartition
-from .delete_list_partition import PostgresDeleteListPartition as PostgresDeleteListPartition
-from .delete_materialized_view_model import PostgresDeleteMaterializedViewModel as PostgresDeleteMaterializedViewModel
-from .delete_partitioned_model import PostgresDeletePartitionedModel as PostgresDeletePartitionedModel
-from .delete_range_partition import PostgresDeleteRangePartition as PostgresDeleteRangePartition
-from .delete_view_model import PostgresDeleteViewModel as PostgresDeleteViewModel
+from .add_default_partition import PostgresAddDefaultPartition
+from .add_hash_partition import PostgresAddHashPartition
+from .add_list_partition import PostgresAddListPartition
+from .add_range_partition import PostgresAddRangePartition
+from .apply_state import ApplyState
+from .create_materialized_view_model import PostgresCreateMaterializedViewModel
+from .create_partitioned_model import PostgresCreatePartitionedModel
+from .create_view_model import PostgresCreateViewModel
+from .delete_default_partition import PostgresDeleteDefaultPartition
+from .delete_hash_partition import PostgresDeleteHashPartition
+from .delete_list_partition import PostgresDeleteListPartition
+from .delete_materialized_view_model import PostgresDeleteMaterializedViewModel
+from .delete_partitioned_model import PostgresDeletePartitionedModel
+from .delete_range_partition import PostgresDeleteRangePartition
+from .delete_view_model import PostgresDeleteViewModel
+
+__all__ = [
+    "ApplyState",
+    "PostgresAddHashPartition",
+    "PostgresAddListPartition",
+    "PostgresAddRangePartition",
+    "PostgresAddDefaultPartition",
+    "PostgresDeleteDefaultPartition",
+    "PostgresDeleteHashPartition",
+    "PostgresDeleteListPartition",
+    "PostgresDeleteRangePartition",
+    "PostgresCreatePartitionedModel",
+    "PostgresDeletePartitionedModel",
+    "PostgresCreateViewModel",
+    "PostgresCreateMaterializedViewModel",
+    "PostgresDeleteViewModel",
+    "PostgresDeleteMaterializedViewModel",
+]
diff --git a/stubs/psqlextra-stubs/backend/migrations/operations/add_default_partition.pyi b/stubs/psqlextra-stubs/backend/migrations/operations/add_default_partition.pyi
@@ -4,4 +4,3 @@ class PostgresAddDefaultPartition(PostgresPartitionOperation):
     def state_forwards(self, app_label, state) -> None: ...
     def database_forwards(self, app_label, schema_editor, from_state, to_state) -> None: ...
     def database_backwards(self, app_label, schema_editor, from_state, to_state) -> None: ...
-    def describe(self) -> str: ...
diff --git a/stubs/psqlextra-stubs/backend/migrations/operations/add_hash_partition.pyi b/stubs/psqlextra-stubs/backend/migrations/operations/add_hash_partition.pyi
@@ -10,4 +10,3 @@ class PostgresAddHashPartition(PostgresPartitionOperation):
     def database_forwards(self, app_label, schema_editor, from_state, to_state) -> None: ...
     def database_backwards(self, app_label, schema_editor, from_state, to_state) -> None: ...
     def deconstruct(self): ...
-    def describe(self) -> str: ...
diff --git a/stubs/psqlextra-stubs/backend/migrations/operations/add_list_partition.pyi b/stubs/psqlextra-stubs/backend/migrations/operations/add_list_partition.pyi
@@ -9,4 +9,3 @@ class PostgresAddListPartition(PostgresPartitionOperation):
     def database_forwards(self, app_label, schema_editor, from_state, to_state) -> None: ...
     def database_backwards(self, app_label, schema_editor, from_state, to_state) -> None: ...
     def deconstruct(self): ...
-    def describe(self) -> str: ...
diff --git a/stubs/psqlextra-stubs/backend/migrations/operations/add_range_partition.pyi b/stubs/psqlextra-stubs/backend/migrations/operations/add_range_partition.pyi
@@ -10,4 +10,3 @@ class PostgresAddRangePartition(PostgresPartitionOperation):
     def database_forwards(self, app_label, schema_editor, from_state, to_state) -> None: ...
     def database_backwards(self, app_label, schema_editor, from_state, to_state) -> None: ...
     def deconstruct(self): ...
-    def describe(self) -> str: ...
diff --git a/stubs/psqlextra-stubs/backend/migrations/operations/apply_state.pyi b/stubs/psqlextra-stubs/backend/migrations/operations/apply_state.pyi
@@ -1,16 +1,13 @@
-from _typeshed import Incomplete
-
 from django.db.migrations.operations.base import Operation
 
 class ApplyState(Operation):
     reduces_to_sql: bool
-    state_operation: Incomplete
+    state_operation: Operation
     def __init__(self, state_operation: Operation) -> None: ...
     def deconstruct(self): ...
     @property
-    def reversible(self): ...
+    def reversible(self) -> bool: ...  # type: ignore[override]
     def state_forwards(self, app_label, state) -> None: ...
     def state_backwards(self, app_label, state) -> None: ...
     def database_forwards(self, app_label, schema_editor, from_state, to_state) -> None: ...
     def database_backwards(self, app_label, schema_editor, from_state, to_state) -> None: ...
-    def describe(self): ...
diff --git a/stubs/psqlextra-stubs/backend/migrations/operations/create_materialized_view_model.pyi b/stubs/psqlextra-stubs/backend/migrations/operations/create_materialized_view_model.pyi
@@ -9,13 +9,12 @@ class PostgresCreateMaterializedViewModel(CreateModel):
         self,
         name,
         fields,
-        options: Incomplete | None = ...,
-        view_options=...,
-        bases: Incomplete | None = ...,
-        managers: Incomplete | None = ...,
+        options: Incomplete | None = None,
+        view_options={},
+        bases: Incomplete | None = None,
+        managers: Incomplete | None = None,
     ) -> None: ...
     def state_forwards(self, app_label, state) -> None: ...
     def database_forwards(self, app_label, schema_editor, from_state, to_state) -> None: ...
     def database_backwards(self, app_label, schema_editor, from_state, to_state) -> None: ...
     def deconstruct(self): ...
-    def describe(self): ...
diff --git a/stubs/psqlextra-stubs/backend/migrations/operations/create_partitioned_model.pyi b/stubs/psqlextra-stubs/backend/migrations/operations/create_partitioned_model.pyi
@@ -9,14 +9,13 @@ class PostgresCreatePartitionedModel(CreateModel):
         self,
         name,
         fields,
-        options: Incomplete | None = ...,
-        partitioning_options=...,
-        bases: Incomplete | None = ...,
-        managers: Incomplete | None = ...,
+        options: Incomplete | None = None,
+        partitioning_options={},
+        bases: Incomplete | None = None,
+        managers: Incomplete | None = None,
     ) -> None: ...
     def state_forwards(self, app_label, state) -> None: ...
     def database_forwards(self, app_label, schema_editor, from_state, to_state) -> None: ...
     def database_backwards(self, app_label, schema_editor, from_state, to_state) -> None: ...
     def deconstruct(self): ...
-    def describe(self): ...
     def reduce(self, *args, **kwargs): ...
diff --git a/stubs/psqlextra-stubs/backend/migrations/operations/create_view_model.pyi b/stubs/psqlextra-stubs/backend/migrations/operations/create_view_model.pyi
@@ -1,21 +1,24 @@
 from _typeshed import Incomplete
+from collections.abc import Mapping, Sequence
+from typing import Any
 
 from django.db.migrations.operations.models import CreateModel
+from django.db.migrations.state import ProjectState
+from django.db.models import Field
 
 class PostgresCreateViewModel(CreateModel):
-    serialization_expand_args: Incomplete
-    view_options: Incomplete
+    serialization_expand_args: list[str]
+    view_options: Mapping[Incomplete, Incomplete]
     def __init__(
         self,
-        name,
-        fields,
-        options: Incomplete | None = ...,
-        view_options=...,
-        bases: Incomplete | None = ...,
-        managers: Incomplete | None = ...,
+        name: str,
+        fields: Sequence[tuple[str, Field[Any, Any]]],
+        options: Incomplete | None = None,
+        view_options={},
+        bases: Mapping[Incomplete, Incomplete] | None = None,
+        managers: Incomplete | None = None,
     ) -> None: ...
-    def state_forwards(self, app_label, state) -> None: ...
+    def state_forwards(self, app_label: str, state: ProjectState) -> None: ...
     def database_forwards(self, app_label, schema_editor, from_state, to_state) -> None: ...
     def database_backwards(self, app_label, schema_editor, from_state, to_state) -> None: ...
     def deconstruct(self): ...
-    def describe(self): ...
diff --git a/stubs/psqlextra-stubs/backend/migrations/operations/delete_default_partition.pyi b/stubs/psqlextra-stubs/backend/migrations/operations/delete_default_partition.pyi
@@ -1,5 +1,3 @@
 from psqlextra.backend.migrations.operations.delete_partition import PostgresDeletePartition
 
-class PostgresDeleteDefaultPartition(PostgresDeletePartition):
-    def database_backwards(self, app_label, schema_editor, from_state, to_state) -> None: ...
-    def describe(self) -> str: ...
+class PostgresDeleteDefaultPartition(PostgresDeletePartition): ...
diff --git a/stubs/psqlextra-stubs/backend/migrations/operations/delete_hash_partition.pyi b/stubs/psqlextra-stubs/backend/migrations/operations/delete_hash_partition.pyi
@@ -1,5 +1,3 @@
 from psqlextra.backend.migrations.operations.delete_partition import PostgresDeletePartition
 
-class PostgresDeleteHashPartition(PostgresDeletePartition):
-    def database_backwards(self, app_label, schema_editor, from_state, to_state) -> None: ...
-    def describe(self) -> str: ...
+class PostgresDeleteHashPartition(PostgresDeletePartition): ...
diff --git a/stubs/psqlextra-stubs/backend/migrations/operations/delete_list_partition.pyi b/stubs/psqlextra-stubs/backend/migrations/operations/delete_list_partition.pyi
@@ -1,5 +1,3 @@
 from psqlextra.backend.migrations.operations.delete_partition import PostgresDeletePartition
 
-class PostgresDeleteListPartition(PostgresDeletePartition):
-    def database_backwards(self, app_label, schema_editor, from_state, to_state) -> None: ...
-    def describe(self) -> str: ...
+class PostgresDeleteListPartition(PostgresDeletePartition): ...
diff --git a/stubs/psqlextra-stubs/backend/migrations/operations/delete_materialized_view_model.pyi b/stubs/psqlextra-stubs/backend/migrations/operations/delete_materialized_view_model.pyi
@@ -1,6 +1,3 @@
 from django.db.migrations.operations.models import DeleteModel
 
-class PostgresDeleteMaterializedViewModel(DeleteModel):
-    def database_forwards(self, app_label, schema_editor, from_state, to_state) -> None: ...
-    def database_backwards(self, app_label, schema_editor, from_state, to_state) -> None: ...
-    def describe(self): ...
+class PostgresDeleteMaterializedViewModel(DeleteModel): ...
diff --git a/stubs/psqlextra-stubs/backend/migrations/operations/delete_partition.pyi b/stubs/psqlextra-stubs/backend/migrations/operations/delete_partition.pyi
@@ -2,6 +2,3 @@ from psqlextra.backend.migrations.operations.partition import PostgresPartitionO
 
 class PostgresDeletePartition(PostgresPartitionOperation):
     def state_forwards(self, app_label, state) -> None: ...
-    def database_forwards(self, app_label, schema_editor, from_state, to_state) -> None: ...
-    def database_backwards(self, app_label, schema_editor, from_state, to_state) -> None: ...
-    def describe(self) -> str: ...
diff --git a/stubs/psqlextra-stubs/backend/migrations/operations/delete_partitioned_model.pyi b/stubs/psqlextra-stubs/backend/migrations/operations/delete_partitioned_model.pyi
@@ -1,6 +1,3 @@
 from django.db.migrations.operations.models import DeleteModel
 
-class PostgresDeletePartitionedModel(DeleteModel):
-    def database_forwards(self, app_label, schema_editor, from_state, to_state) -> None: ...
-    def database_backwards(self, app_label, schema_editor, from_state, to_state) -> None: ...
-    def describe(self): ...
+class PostgresDeletePartitionedModel(DeleteModel): ...
diff --git a/stubs/psqlextra-stubs/backend/migrations/operations/delete_range_partition.pyi b/stubs/psqlextra-stubs/backend/migrations/operations/delete_range_partition.pyi
@@ -1,5 +1,3 @@
 from psqlextra.backend.migrations.operations.delete_partition import PostgresDeletePartition
 
-class PostgresDeleteRangePartition(PostgresDeletePartition):
-    def database_backwards(self, app_label, schema_editor, from_state, to_state) -> None: ...
-    def describe(self) -> str: ...
+class PostgresDeleteRangePartition(PostgresDeletePartition): ...
diff --git a/stubs/psqlextra-stubs/backend/migrations/operations/delete_view_model.pyi b/stubs/psqlextra-stubs/backend/migrations/operations/delete_view_model.pyi
@@ -1,6 +1,3 @@
 from django.db.migrations.operations.models import DeleteModel
 
-class PostgresDeleteViewModel(DeleteModel):
-    def database_forwards(self, app_label, schema_editor, from_state, to_state) -> None: ...
-    def database_backwards(self, app_label, schema_editor, from_state, to_state) -> None: ...
-    def describe(self): ...
+class PostgresDeleteViewModel(DeleteModel): ...
diff --git a/stubs/psqlextra-stubs/backend/migrations/operations/partition.pyi b/stubs/psqlextra-stubs/backend/migrations/operations/partition.pyi
@@ -1,13 +1,13 @@
-from _typeshed import Incomplete
+from typing import Any
 
 from django.db.migrations.operations.base import Operation
 
 class PostgresPartitionOperation(Operation):
-    model_name: Incomplete
-    model_name_lower: Incomplete
-    name: Incomplete
+    model_name: str
+    model_name_lower: str
+    name: str
     def __init__(self, model_name: str, name: str) -> None: ...
-    def deconstruct(self): ...
+    def deconstruct(self) -> tuple[str, list[Any], dict[str, Any]]: ...
     def state_forwards(self, *args, **kwargs) -> None: ...
     def state_backwards(self, *args, **kwargs) -> None: ...
-    def reduce(self, *args, **kwargs): ...
+    def reduce(self, *args, **kwargs) -> bool: ...
diff --git a/stubs/psqlextra-stubs/backend/migrations/state/partitioning.pyi b/stubs/psqlextra-stubs/backend/migrations/state/partitioning.pyi
@@ -25,6 +25,6 @@ class PostgresHashPartitionState(PostgresPartitionState):
 class PostgresPartitionedModelState(PostgresModelState):
     partitions: Incomplete
     partitioning_options: Incomplete
-    def __init__(self, *args, partitions: list[PostgresPartitionState] = ..., partitioning_options=..., **kwargs) -> None: ...
+    def __init__(self, *args, partitions: list[PostgresPartitionState] = [], partitioning_options={}, **kwargs) -> None: ...
     def add_partition(self, partition: PostgresPartitionState): ...
     def delete_partition(self, name: str): ...
diff --git a/stubs/psqlextra-stubs/backend/migrations/state/view.pyi b/stubs/psqlextra-stubs/backend/migrations/state/view.pyi
@@ -1,7 +1,8 @@
-from _typeshed import Incomplete
+from collections.abc import Mapping
+from typing import Any
 
 from psqlextra.backend.migrations.state.model import PostgresModelState
 
 class PostgresViewModelState(PostgresModelState):
-    view_options: Incomplete
-    def __init__(self, *args, view_options=..., **kwargs) -> None: ...
+    view_options: dict[str, Any]
+    def __init__(self, *args, view_options: Mapping[str, Any] = {}, **kwargs) -> None: ...
diff --git a/stubs/psqlextra-stubs/expressions.pyi b/stubs/psqlextra-stubs/expressions.pyi
@@ -24,26 +24,26 @@ class HStoreRef(F):
     def __init__(self, name: str, key: str) -> None: ...
     def resolve_expression(  # type: ignore[override]
         self,
-        query: Incomplete = ...,
-        allow_joins: bool = ...,
-        reuse: set[str] | None = ...,
-        summarize: bool = ...,
-        for_save: bool = ...,
+        query: Incomplete = None,
+        allow_joins: bool = True,
+        reuse: set[str] | None = None,
+        summarize: bool = False,
+        for_save: bool = False,
     ) -> HStoreColumn: ...
 
 class DateTimeEpochColumn(Col): ...
 
 class DateTimeEpoch(F):
     def resolve_expression(  # type: ignore[override]
         self,
-        query: Incomplete = ...,
-        allow_joins: bool = ...,
-        reuse: set[str] | None = ...,
-        summarize: bool = ...,
-        for_save: bool = ...,
+        query: Incomplete = None,
+        allow_joins: bool = True,
+        reuse: set[str] | None = None,
+        summarize: bool = False,
+        for_save: bool = False,
     ) -> DateTimeEpochColumn: ...
 
-def IsNotNone(*fields: str, default: Incomplete | None = None) -> Case: ...
+def IsNotNone(*fields: str, default: object | None = None) -> Case: ...
 
 class ExcludedCol(Expression):
     name: str
diff --git a/stubs/psqlextra-stubs/models/base.pyi b/stubs/psqlextra-stubs/models/base.pyi
@@ -10,4 +10,4 @@ class PostgresModel(models.Model):
         abstract: bool
         base_manager_name: str
 
-    objects: ClassVar[PostgresManager[Self]]  # type: ignore[assignment]
+    objects: ClassVar[PostgresManager[Self]]
diff --git a/stubs/psqlextra-stubs/partitioning/current_time_strategy.pyi b/stubs/psqlextra-stubs/partitioning/current_time_strategy.pyi
@@ -1,18 +1,17 @@
-from _typeshed import Incomplete
+import datetime as dt
 from collections.abc import Generator
-from datetime import datetime
 
-from dateutil.relativedelta import relativedelta as relativedelta
+from dateutil.relativedelta import relativedelta
 
 from psqlextra.partitioning.range_strategy import PostgresRangePartitioningStrategy
 from psqlextra.partitioning.time_partition import PostgresTimePartition
 from psqlextra.partitioning.time_partition_size import PostgresTimePartitionSize
 
 class PostgresCurrentTimePartitioningStrategy(PostgresRangePartitioningStrategy):
-    size: Incomplete
-    count: Incomplete
-    max_age: Incomplete
-    def __init__(self, size: PostgresTimePartitionSize, count: int, max_age: relativedelta | None = ...) -> None: ...
-    def to_create(self) -> Generator[PostgresTimePartition, None, None]: ...
-    def to_delete(self) -> Generator[PostgresTimePartition, None, None]: ...
-    def get_start_datetime(self) -> datetime: ...
+    size: PostgresTimePartitionSize
+    count: int
+    max_age: relativedelta | None
+    def __init__(self, size: PostgresTimePartitionSize, count: int, max_age: relativedelta | None = None) -> None: ...
+    def to_create(self) -> Generator[PostgresTimePartition]: ...
+    def to_delete(self) -> Generator[PostgresTimePartition]: ...
+    def get_start_datetime(self) -> dt.datetime: ...
diff --git a/stubs/psqlextra-stubs/partitioning/manager.pyi b/stubs/psqlextra-stubs/partitioning/manager.pyi
@@ -1,4 +1,3 @@
-from _typeshed import Incomplete
 from typing_extensions import TypeAlias
 
 from psqlextra.models import PostgresPartitionedModel
@@ -9,7 +8,9 @@ from psqlextra.partitioning.plan import PostgresPartitioningPlan
 PartitionList: TypeAlias = list[tuple[PostgresPartitionedModel, list[PostgresPartition]]]
 
 class PostgresPartitioningManager:
-    configs: Incomplete
+    configs: list[PostgresPartitioningConfig]
     def __init__(self, configs: list[PostgresPartitioningConfig]) -> None: ...
-    def plan(self, skip_create: bool = ..., skip_delete: bool = ..., using: str | None = ...) -> PostgresPartitioningPlan: ...
+    def plan(
+        self, skip_create: bool = False, skip_delete: bool = False, using: str | None = None
+    ) -> PostgresPartitioningPlan: ...
     def find_config_for_model(self, model: PostgresPartitionedModel) -> PostgresPartitioningConfig | None: ...
diff --git a/stubs/psqlextra-stubs/partitioning/partition.pyi b/stubs/psqlextra-stubs/partitioning/partition.pyi
@@ -4,11 +4,15 @@ from typing import Any
 from psqlextra.backend.schema import PostgresSchemaEditor
 from psqlextra.models import PostgresPartitionedModel
 
+__all__ = ["PostgresPartition"]
+
 class PostgresPartition(metaclass=ABCMeta):
     @abstractmethod
     def name(self) -> str: ...
     @abstractmethod
-    def create(self, model: PostgresPartitionedModel, schema_editor: PostgresSchemaEditor, comment: str | None = ...) -> None: ...
+    def create(
+        self, model: PostgresPartitionedModel, schema_editor: PostgresSchemaEditor, comment: str | None = None
+    ) -> None: ...
     @abstractmethod
     def delete(self, model: PostgresPartitionedModel, schema_editor: PostgresSchemaEditor) -> None: ...
     def deconstruct(self) -> dict[str, Any]: ...
diff --git a/stubs/psqlextra-stubs/partitioning/plan.pyi b/stubs/psqlextra-stubs/partitioning/plan.pyi
diff --git a/stubs/psqlextra-stubs/partitioning/shorthands.pyi b/stubs/psqlextra-stubs/partitioning/shorthands.pyi
diff --git a/stubs/psqlextra-stubs/partitioning/time_partition_size.pyi b/stubs/psqlextra-stubs/partitioning/time_partition_size.pyi
diff --git a/stubs/psqlextra-stubs/partitioning/time_strategy.pyi b/stubs/psqlextra-stubs/partitioning/time_strategy.pyi
diff --git a/tests/geopandas/test_geodataframe.py b/tests/geopandas/test_geodataframe.py
diff --git a/tests/geopandas/test_geoseries.py b/tests/geopandas/test_geoseries.py
diff --git a/uv.lock b/uv.lock
