Lock file maintenance (canonical#283)

* Lock file maintenance * Tweak renovate * Pin python version * Ignore renovate conf * Poetry warning --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Dragomir Penev <[email protected]>
BON4 · Nov 16, 2023 · ff7f9b9 · ff7f9b9
1 parent 7b539f4
commit ff7f9b9
Show file tree

Hide file tree

Showing 8 changed files with 76 additions and 92 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"
 repository = "https://github.com/canonical/postgresql-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
@@ -89,7 +89,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/src/relations/db.py b/src/relations/db.py
@@ -131,7 +131,7 @@ def set_up_relation(self, relation: Relation) -> bool:
         """Set up the relation to be used by the application charm."""
         # Do not allow apps requesting extensions to be installed
         # (let them now about config options).
-        required_extensions, disabled_extensions = self._get_extensions(relation)
+        _, disabled_extensions = self._get_extensions(relation)
         if disabled_extensions:
             logger.error(
                 f"ERROR - `extensions` ({', '.join(disabled_extensions)}) cannot be requested through relations"

diff --git a/tox.ini b/tox.ini
@@ -33,7 +33,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}
@@ -45,7 +45,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}
@@ -58,7 +58,7 @@ description = Run unit tests
 set_env =
     {[testenv]set_env}
 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
@@ -77,7 +77,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
@@ -96,7 +96,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
@@ -115,7 +115,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
@@ -134,7 +134,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
@@ -153,7 +153,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
@@ -172,7 +172,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
@@ -191,7 +191,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
@@ -210,7 +210,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_restore_cluster.py
@@ -229,7 +229,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
@@ -248,7 +248,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
@@ -267,7 +267,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
@@ -286,7 +286,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
@@ -305,7 +305,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
@@ -325,7 +325,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}