[python ci] Update Python CI dependencies (major) (#335)

* [python ci] Update Python CI dependencies

* Linting

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Dragomir Penev <[email protected]>

Author: renovate[bot]

poetry.lock

@@ -42,7 +42,7 @@ jsonschema = "*"
 optional = true
 
 [tool.poetry.group.format.dependencies]
-black = "^23.12.1"
+black = "^24.2.0"
 ruff = "^0.3.1"
 
 [tool.poetry.group.lint]
@@ -56,7 +56,7 @@ optional = true
 
 [tool.poetry.group.unit.dependencies]
 coverage = {extras = ["toml"], version = "^7.4.3"}
-pytest = "^7.4.4"
+pytest = "^8.0.2"
 pytest-asyncio = "*"
 parameterized = "^0.9.0"
 jsonschema = "^4.21.1"
@@ -66,7 +66,7 @@ jinja2 = "^3.1.3"
 optional = true
 
 [tool.poetry.group.integration.dependencies]
-pytest = "^7.4.4"
+pytest = "^8.0.2"
 pytest-github-secrets = {git = "https://github.com/canonical/data-platform-workflows", tag = "v12.6.2", subdirectory = "python/pytest_plugins/github_secrets"}
 pytest-operator = "^0.34.0"
 pytest-operator-cache = {git = "https://github.com/canonical/data-platform-workflows", tag = "v12.6.2", subdirectory = "python/pytest_plugins/pytest_operator_cache"}

pyproject.toml

@@ -870,9 +870,9 @@ def _retrieve_s3_parameters(self) -> Tuple[Dict, List[str]]:
         # Clean up extra slash symbols to avoid issues on 3rd-party storages
         # like Ceph Object Gateway (radosgw).
         s3_parameters["endpoint"] = s3_parameters["endpoint"].rstrip("/")
-        s3_parameters[
-            "path"
-        ] = f'/{s3_parameters["path"].strip("/")}'  # The slash in the beginning is required by pgBackRest.
+        s3_parameters["path"] = (
+            f'/{s3_parameters["path"].strip("/")}'  # The slash in the beginning is required by pgBackRest.
+        )
         s3_parameters["bucket"] = s3_parameters["bucket"].strip("/")
 
         return s3_parameters, []

src/backups.py

@@ -1990,10 +1990,14 @@ def test_handle_postgresql_restart_need(
 
                 self.charm._handle_postgresql_restart_need(values[0])
                 _reload_patroni_configuration.assert_called_once()
-                self.assertIn(
-                    "tls", self.harness.get_relation_data(self.rel_id, self.charm.unit)
-                ) if values[0] else self.assertNotIn(
-                    "tls", self.harness.get_relation_data(self.rel_id, self.charm.unit)
+                (
+                    self.assertIn(
+                        "tls", self.harness.get_relation_data(self.rel_id, self.charm.unit)
+                    )
+                    if values[0]
+                    else self.assertNotIn(
+                        "tls", self.harness.get_relation_data(self.rel_id, self.charm.unit)
+                    )
                 )
                 if (values[1] != values[2]) or values[3]:
                     self.assertNotIn(
@@ -2002,12 +2006,16 @@ def test_handle_postgresql_restart_need(
                     )
                     _restart.assert_called_once()
                 else:
-                    self.assertIn(
-                        "postgresql_restarted",
-                        self.harness.get_relation_data(self.rel_id, self.charm.unit),
-                    ) if values[4] else self.assertNotIn(
-                        "postgresql_restarted",
-                        self.harness.get_relation_data(self.rel_id, self.charm.unit),
+                    (
+                        self.assertIn(
+                            "postgresql_restarted",
+                            self.harness.get_relation_data(self.rel_id, self.charm.unit),
+                        )
+                        if values[4]
+                        else self.assertNotIn(
+                            "postgresql_restarted",
+                            self.harness.get_relation_data(self.rel_id, self.charm.unit),
+                        )
                     )
                     _restart.assert_not_called()
 

tests/unit/test_charm.py

@@ -40,7 +40,7 @@ commands_pre =
     poetry install --only format --no-root
 commands =
     poetry lock --no-update
-    poetry run ruff --fix {[vars]all_path}
+    poetry run ruff check --fix {[vars]all_path}
     poetry run black {[vars]all_path}
 
 [testenv:lint]
@@ -53,7 +53,7 @@ commands_pre =
 commands =
     poetry check --lock
     poetry run codespell {[vars]all_path}
-    poetry run ruff {[vars]all_path}
+    poetry run ruff check {[vars]all_path}
     poetry run black --check --diff {[vars]all_path}
     find {[vars]all_path} -type f \( -name "*.sh" -o -name "*.bash" \) -exec poetry run shellcheck --color=always \{\} +