pglift-cli 1.9.0__tar.gz → 2.0.0__tar.gz

{pglift_cli-1.9.0 → pglift_cli-2.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: pglift_cli
-Version: 1.9.0
+Version: 2.0.0
 Summary: Command-line interface for pglift
 Project-URL: Documentation, https://pglift.readthedocs.io/
 Project-URL: Source, https://gitlab.com/dalibo/pglift/
@@ -15,7 +15,6 @@ Classifier: Intended Audience :: System Administrators
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
@@ -23,18 +22,17 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Database
 Classifier: Topic :: System :: Systems Administration
 Classifier: Typing :: Typed
-Requires-Python: <4,>=3.9
+Requires-Python: <4,>=3.10
 Requires-Dist: click!=8.1.0,!=8.1.4,>=8.0.0
 Requires-Dist: filelock!=3.12.1,>=3.9.0
 Requires-Dist: pluggy
 Requires-Dist: psycopg>=3.1
-Requires-Dist: pydantic!=2.10.0,!=2.10.1,>=2.5.0
+Requires-Dist: pydantic>=2.10.2
 Requires-Dist: pyyaml>=6.0.1
 Requires-Dist: rich!=13.9.0,>=11.0.0
 Provides-Extra: dev
 Requires-Dist: anyio; extra == 'dev'
-Requires-Dist: mypy!=1.11.*,!=1.12.*,>=1.10.0; (python_version < '3.10') and extra == 'dev'
-Requires-Dist: mypy>=1.10.0; (python_version >= '3.10') and extra == 'dev'
+Requires-Dist: mypy>=1.10.0; extra == 'dev'
 Requires-Dist: patroni[etcd]>=2.1.5; extra == 'dev'
 Requires-Dist: port-for; extra == 'dev'
 Requires-Dist: prysk[pytest-plugin]>=0.14.0; extra == 'dev'
@@ -51,8 +49,7 @@ Requires-Dist: pytest-cov; extra == 'test'
 Requires-Dist: pytest>=8; extra == 'test'
 Requires-Dist: trustme; extra == 'test'
 Provides-Extra: typing
-Requires-Dist: mypy!=1.11.*,!=1.12.*,>=1.10.0; (python_version < '3.10') and extra == 'typing'
-Requires-Dist: mypy>=1.10.0; (python_version >= '3.10') and extra == 'typing'
+Requires-Dist: mypy>=1.10.0; extra == 'typing'
 Requires-Dist: types-pyyaml>=6.0.12.10; extra == 'typing'
 Description-Content-Type: text/markdown
 

{pglift_cli-1.9.0 → pglift_cli-2.0.0}/pyproject.toml

@@ -10,7 +10,7 @@ build-backend = "hatchling.build"
 name = "pglift_cli"
 description = "Command-line interface for pglift"
 readme = "README.md"
-requires-python = ">=3.9, <4"
+requires-python = ">=3.10, <4"
 license = { text = "GPLv3" }
 authors = [{ name = "Dalibo SCOP", email = "contact@dalibo.com" }]
 keywords = [
@@ -28,7 +28,6 @@ classifiers = [
     "Topic :: Database",
     "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
@@ -44,7 +43,7 @@ dependencies = [
     "filelock >= 3.9.0, != 3.12.1",
     "pluggy",
     "psycopg >= 3.1",
-    "pydantic >= 2.5.0, != 2.10.0, != 2.10.1",
+    "pydantic >= 2.10.2",
     "rich >= 11.0.0, != 13.9.0",
 ]
 
@@ -59,8 +58,7 @@ test = [
     "trustme",
 ]
 typing = [
-    "mypy >= 1.10.0 ; python_version >= '3.10'",
-    "mypy >= 1.10.0, != 1.11.*, != 1.12.* ; python_version < '3.10'",
+    "mypy >= 1.10.0",
     "types-PyYAML >= 6.0.12.10",
 ]
 dev = [

pglift_cli-2.0.0/pytest.ini

@@ -0,0 +1,10 @@
+# SPDX-FileCopyrightText: 2025 Dalibo
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+[pytest]
+addopts = --strict-config --strict-markers
+filterwarnings =
+  error
+  ignore:cannot guess 'postgresql.versions' setting as 'bindir' is unset:RuntimeWarning
+testpaths = tests/unit

{pglift_cli-1.9.0 → pglift_cli-2.0.0}/src/pglift_cli/_settings.py

@@ -2,23 +2,15 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-import warnings
 from pathlib import Path
-from typing import Annotated, Any, Optional
+from typing import Annotated, Any
 
-from pydantic import AfterValidator, Field, ValidationInfo
+from pydantic import BeforeValidator, Field
 
 from pglift.settings import Settings as BaseSettings
 from pglift.settings import SiteSettings as BaseSiteSettings
 from pglift.settings.base import BaseModel, LogPath, RunPath
-
-
-def deprecated(value: Any, info: ValidationInfo) -> Any:
-    if value is not None:
-        warnings.warn(
-            f"{info.field_name!r} setting is deprecated", FutureWarning, stacklevel=2
-        )
-    return value
+from pglift.types import LogLevel
 
 
 class AuditSettings(BaseModel):
@@ -38,21 +30,23 @@ class AuditSettings(BaseModel):
     ] = "%Y-%m-%d %H:%M:%S"
 
 
+def _upper(value: Any) -> Any:
+    if isinstance(value, str):
+        return value.upper()
+    return value
+
+
 class CLISettings(BaseModel):
     """Settings for pglift's command-line interface."""
 
-    logpath: Annotated[
-        Annotated[Optional[Path], LogPath],
-        Field(
-            description="Directory where temporary debug files from command executions will be stored (DEPRECATED).",
-        ),
-        AfterValidator(deprecated),
-    ] = None
-
     log_format: Annotated[
         str, Field(description="Format for log messages when written to a file")
     ] = "%(asctime)s %(levelname)-8s %(name)s - %(message)s"
 
+    log_level: Annotated[
+        LogLevel | None, Field(description="Log level"), BeforeValidator(_upper)
+    ] = None
+
     date_format: Annotated[
         str, Field(description="Date format in log messages when written to a file")
     ] = "%Y-%m-%d %H:%M:%S"
@@ -62,7 +56,7 @@ class CLISettings(BaseModel):
     ] = Path(".pglift.lock")
 
     audit: Annotated[
-        Optional[AuditSettings],
+        AuditSettings | None,
         Field(description="Settings for change operations auditing"),
     ] = None
 

{pglift_cli-1.9.0 → pglift_cli-2.0.0}/src/pglift_cli/database.py

@@ -14,8 +14,8 @@ import psycopg
 from attrs import asdict
 from pydantic.v1.utils import deep_update
 
-from pglift import databases, postgresql, privileges, task
-from pglift.models import interface, system
+from pglift import databases, diff, postgresql, privileges, task
+from pglift.models import PostgreSQLInstance, interface
 
 from . import model
 from .util import (
@@ -25,6 +25,7 @@ from .util import (
     OutputFormat,
     async_command,
     audit,
+    diff_options,
     dry_run_option,
     instance_identifier_option,
     manifest_option,
@@ -33,6 +34,7 @@ from .util import (
     pass_postgresql_instance,
     print_argspec,
     print_json_for,
+    print_result_diff,
     print_schema,
     print_table_for,
 )
@@ -67,7 +69,7 @@ def cli(**kwargs: Any) -> None:
 @click.pass_obj
 @async_command
 async def create(
-    obj: Obj, instance: system.PostgreSQLInstance, database: interface.Database
+    obj: Obj, instance: PostgreSQLInstance, database: interface.Database
 ) -> None:
     """Create a database in a PostgreSQL instance"""
     with obj.lock, audit():
@@ -78,14 +80,14 @@ async def create(
                 await databases.apply(instance, database)
 
 
-@cli.command("alter")  # type: ignore[arg-type]
+@cli.command("alter")
 @model.as_parameters(interface.Database, "update")
 @click.argument("dbname")
 @pass_postgresql_instance
-@click.pass_obj
+@click.pass_obj  # type: ignore[arg-type]
 @async_command
 async def alter(
-    obj: Obj, instance: system.PostgreSQLInstance, dbname: str, **changes: Any
+    obj: Obj, instance: PostgreSQLInstance, dbname: str, **changes: Any
 ) -> None:
     """Alter a database in a PostgreSQL instance"""
     with obj.lock, audit():
@@ -99,27 +101,32 @@ async def alter(
 @cli.command("apply", hidden=True)
 @manifest_option
 @output_format_option
+@diff_options["unified"]
+@diff_options["ansible"]
 @dry_run_option
 @pass_postgresql_instance
 @click.pass_obj
 @async_command
 async def apply(
     obj: Obj,
-    instance: system.PostgreSQLInstance,
+    instance: PostgreSQLInstance,
     data: ManifestData,
     output_format: OutputFormat | None,
     dry_run: bool,
+    diff_format: diff.Format | None,
 ) -> None:
     """Apply manifest as a database"""
     database = interface.Database.model_validate(data)
     if dry_run:
         ret = interface.ApplyResult(change_state=None)
     else:
-        with obj.lock, audit():
+        with obj.lock, audit(dry_run=dry_run), diff.enabled(diff_format):
             async with postgresql.running(instance):
                 ret = await databases.apply(instance, database)
     if output_format == "json":
         print_json_for(ret)
+    else:
+        print_result_diff(ret)
 
 
 @cli.command("get")
@@ -128,7 +135,7 @@ async def apply(
 @pass_postgresql_instance
 @async_command
 async def get(
-    instance: system.PostgreSQLInstance, name: str, output_format: OutputFormat | None
+    instance: PostgreSQLInstance, name: str, output_format: OutputFormat | None
 ) -> None:
     """Get the description of a database"""
     async with postgresql.running(instance):
@@ -152,7 +159,7 @@ async def get(
 @pass_postgresql_instance
 @async_command
 async def ls(
-    instance: system.PostgreSQLInstance,
+    instance: PostgreSQLInstance,
     dbname: Sequence[str],
     exclude_dbnames: Sequence[str],
     output_format: OutputFormat | None,
@@ -179,7 +186,7 @@ async def ls(
 @async_command
 async def drop(
     obj: Obj,
-    instance: system.PostgreSQLInstance,
+    instance: PostgreSQLInstance,
     databasedropped: interface.DatabaseDropped,
 ) -> None:
     """Drop a database"""
@@ -196,7 +203,7 @@ async def drop(
 @pass_postgresql_instance
 @async_command
 async def list_privileges(
-    instance: system.PostgreSQLInstance,
+    instance: PostgreSQLInstance,
     name: str,
     roles: Sequence[str],
     defaults: bool,
@@ -233,7 +240,7 @@ async def list_privileges(
 @pass_postgresql_instance
 @async_command
 async def run(
-    instance: system.PostgreSQLInstance,
+    instance: PostgreSQLInstance,
     sql_command: str,
     dbnames: Sequence[str],
     exclude_dbnames: Sequence[str],
@@ -268,9 +275,7 @@ async def run(
 @click.argument("dbname")
 @pass_postgresql_instance
 @async_command
-async def dump(
-    instance: system.PostgreSQLInstance, dbname: str, output: Path | None
-) -> None:
+async def dump(instance: PostgreSQLInstance, dbname: str, output: Path | None) -> None:
     """Dump a database"""
     async with postgresql.running(instance):
         await databases.dump(instance, dbname, output)
@@ -282,7 +287,7 @@ async def dump(
 @pass_postgresql_instance
 @async_command
 async def dumps(
-    instance: system.PostgreSQLInstance,
+    instance: PostgreSQLInstance,
     dbname: Sequence[str],
     output_format: OutputFormat | None,
 ) -> None:
@@ -304,7 +309,7 @@ async def dumps(
 @pass_postgresql_instance
 @async_command
 async def restore(
-    instance: system.PostgreSQLInstance, dump_id: str, targetdbname: str | None
+    instance: PostgreSQLInstance, dump_id: str, targetdbname: str | None
 ) -> None:
     """Restore a database dump