Lock file maintenance (#321)

* Lock file maintenance * Fix linting * Pin python version * Poetry warning --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Dragomir Penev <[email protected]>
canonical · Nov 16, 2023 · dbf16df · dbf16df
1 parent b80bca3
commit dbf16df
Show file tree

Hide file tree

Showing 8 changed files with 296 additions and 289 deletions.
diff --git a/.github/renovate.json5 b/.github/renovate.json5
@@ -4,6 +4,13 @@
   "reviewers": ["dragomirp", "marceloneppel", "taurus-forever"],
   "packageRules": [
     // Later rules override earlier rules
+    {
+      "matchPackageNames": ["pydantic"],
+      "allowedVersions": "<2.0.0"
+    }, {
+      "matchPackageNames": ["python"],
+      "allowedVersions": "<3.11"
+    }
   ],
   "regexManagers": [
     {

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -13,7 +13,7 @@ on:
       - '.jujuignore'
       - 'LICENSE'
       - '**.md'
-      - 'renovate.json'
+      - .github/renovate.json5
   schedule:
     - cron: '53 0 * * *' # Daily at 00:53 UTC
   # Triggered on push to branch "main" by .github/workflows/release.yaml

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -9,8 +9,7 @@ on:
     paths-ignore:
       - 'tests/**'
       - 'docs/**'
-      - renovate.json
-      - poetry.lock
+      - .github/renovate.json5
       - pyproject.toml
       - '.github/workflows/ci.yaml'
       - '.github/workflows/lib-check.yaml'

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -12,7 +12,7 @@ homepage = "https://charmhub.io/postgresql-k8s"
 repository = "https://github.com/canonical/postgresql-k8s-operator"
 
 [tool.poetry.dependencies]
-python = "^3.10.6"
+python = "^3.10"
 ops = "^2.8.0"
 cryptography = "^41.0.5"
 boto3 = "^1.28.70"

diff --git a/src/backups.py b/src/backups.py
@@ -74,7 +74,7 @@ def _are_backup_settings_ok(self) -> Tuple[bool, Optional[str]]:
                 "Relation with s3-integrator charm missing, cannot create/restore backup.",
             )
 
-        s3_parameters, missing_parameters = self._retrieve_s3_parameters()
+        _, missing_parameters = self._retrieve_s3_parameters()
         if missing_parameters:
             return False, f"Missing S3 parameters: {missing_parameters}"
 

diff --git a/tests/integration/ha_tests/helpers.py b/tests/integration/ha_tests/helpers.py
@@ -474,7 +474,7 @@ async def list_wal_files(ops_test: OpsTest, app: str) -> Set:
     files = {}
     for unit in units:
         complete_command = f"run --unit {unit} -- {command}"
-        return_code, stdout, stderr = await ops_test.juju(*complete_command.split())
+        _, stdout, _ = await ops_test.juju(*complete_command.split())
         files[unit] = stdout.splitlines()
         files[unit] = {
             i for i in files[unit] if ".history" not in i and i != "" and i != "archive_status"

diff --git a/tox.ini b/tox.ini
@@ -34,7 +34,7 @@ commands_post =
 [testenv:format]
 description = Apply coding style standards to code
 commands_pre =
-    poetry install --only format
+    poetry install --only format --no-root
 commands =
     poetry lock --no-update
     poetry run ruff --fix {[vars]all_path}
@@ -46,7 +46,7 @@ allowlist_externals =
     {[testenv]allowlist_externals}
     find
 commands_pre =
-    poetry install --only lint,format
+    poetry install --only lint,format --no-root
 commands =
     poetry check --lock
     poetry run codespell {[vars]all_path}
@@ -61,7 +61,7 @@ set_env =
     juju2: LIBJUJU="2.9.44.1"
     juju3: LIBJUJU="3.2.0.1"
 commands_pre =
-    poetry install --only main,charm-libs,unit
+    poetry install --only main,charm-libs,unit --no-root
 commands =
     poetry run coverage run --source={[vars]src_path} \
         -m pytest -v --tb native -s {posargs} {[vars]tests_path}/unit
@@ -80,7 +80,7 @@ pass_env =
 allowlist_externals =
     {[testenv:pack-wrapper]allowlist_externals}
 commands_pre =
-    poetry install --only integration
+    poetry install --only integration --no-root
     {[testenv:pack-wrapper]commands_pre}
 commands =
     poetry run pytest -v --tb native --log-cli-level=INFO -s {posargs} {[vars]tests_path}/integration/test_backups.py
@@ -99,7 +99,7 @@ pass_env =
 allowlist_externals =
     {[testenv:pack-wrapper]allowlist_externals}
 commands_pre =
-    poetry install --only integration
+    poetry install --only integration --no-root
     {[testenv:pack-wrapper]commands_pre}
 commands =
     poetry run pytest -v --tb native --log-cli-level=INFO -s {posargs} {[vars]tests_path}/integration/test_charm.py
@@ -118,7 +118,7 @@ pass_env =
 allowlist_externals =
     {[testenv:pack-wrapper]allowlist_externals}
 commands_pre =
-    poetry install --only integration
+    poetry install --only integration --no-root
     {[testenv:pack-wrapper]commands_pre}
 commands =
     poetry run pytest -v --tb native --log-cli-level=INFO -s {posargs} {[vars]tests_path}/integration/new_relations/test_new_relations.py
@@ -137,7 +137,7 @@ pass_env =
 allowlist_externals =
     {[testenv:pack-wrapper]allowlist_externals}
 commands_pre =
-    poetry install --only integration
+    poetry install --only integration --no-root
     {[testenv:pack-wrapper]commands_pre}
 commands =
     poetry run pytest -v --tb native --log-cli-level=INFO -s {posargs} {[vars]tests_path}/integration/test_db.py
@@ -156,7 +156,7 @@ pass_env =
 allowlist_externals =
     {[testenv:pack-wrapper]allowlist_externals}
 commands_pre =
-    poetry install --only integration
+    poetry install --only integration --no-root
     {[testenv:pack-wrapper]commands_pre}
 commands =
     poetry run pytest -v --tb native --log-cli-level=INFO -s {posargs} {[vars]tests_path}/integration/test_db_admin.py
@@ -175,7 +175,7 @@ pass_env =
 allowlist_externals =
     {[testenv:pack-wrapper]allowlist_externals}
 commands_pre =
-    poetry install --only integration
+    poetry install --only integration --no-root
     {[testenv:pack-wrapper]commands_pre}
 commands =
     poetry run pytest -v --tb native --log-cli-level=INFO -s {posargs} {[vars]tests_path}/integration/ha_tests/test_replication.py
@@ -194,7 +194,7 @@ pass_env =
 allowlist_externals =
     {[testenv:pack-wrapper]allowlist_externals}
 commands_pre =
-    poetry install --only integration
+    poetry install --only integration --no-root
     {[testenv:pack-wrapper]commands_pre}
 commands =
     poetry run pytest -v --tb native --log-cli-level=INFO -s {posargs} {[vars]tests_path}/integration/ha_tests/test_self_healing.py
@@ -213,7 +213,7 @@ pass_env =
 allowlist_externals =
     {[testenv:pack-wrapper]allowlist_externals}
 commands_pre =
-    poetry install --only integration
+    poetry install --only integration --no-root
     {[testenv:pack-wrapper]commands_pre}
 commands =
     poetry run pytest -v --tb native --log-cli-level=INFO -s {posargs} {[vars]tests_path}/integration/test_password_rotation.py
@@ -232,7 +232,7 @@ pass_env =
 allowlist_externals =
     {[testenv:pack-wrapper]allowlist_externals}
 commands_pre =
-    poetry install --only integration
+    poetry install --only integration --no-root
     {[testenv:pack-wrapper]commands_pre}
 commands =
     poetry run pytest -v --tb native --log-cli-level=INFO -s {posargs} {[vars]tests_path}/integration/test_plugins.py
@@ -251,7 +251,7 @@ pass_env =
 allowlist_externals =
     {[testenv:pack-wrapper]allowlist_externals}
 commands_pre =
-    poetry install --only integration
+    poetry install --only integration --no-root
     {[testenv:pack-wrapper]commands_pre}
 commands =
     poetry run pytest -v --tb native --log-cli-level=INFO -s {posargs} {[vars]tests_path}/integration/test_tls.py
@@ -270,7 +270,7 @@ pass_env =
 allowlist_externals =
     {[testenv:pack-wrapper]allowlist_externals}
 commands_pre =
-    poetry install --only integration
+    poetry install --only integration --no-root
     {[testenv:pack-wrapper]commands_pre}
 commands =
     poetry run pytest -v --tb native --log-cli-level=INFO -s {posargs} {[vars]tests_path}/integration/ha_tests/test_upgrade.py
@@ -289,7 +289,7 @@ pass_env =
 allowlist_externals =
     {[testenv:pack-wrapper]allowlist_externals}
 commands_pre =
-    poetry install --only integration
+    poetry install --only integration --no-root
     {[testenv:pack-wrapper]commands_pre}
 commands =
     poetry run pytest -v --tb native --log-cli-level=INFO -s {posargs} {[vars]tests_path}/integration/ha_tests/test_upgrade_from_stable.py
@@ -309,7 +309,7 @@ pass_env =
 allowlist_externals =
     {[testenv:pack-wrapper]allowlist_externals}
 commands_pre =
-    poetry install --only integration
+    poetry install --only integration --no-root
     {[testenv:pack-wrapper]commands_pre}
 commands =
     poetry run pytest -v --tb native --log-cli-level=INFO -s --ignore={[vars]tests_path}/unit/ {posargs}