Merge branch 'main' into secret-errors-1229

.github/workflows/charmcraft-pack.yaml

@@ -33,7 +33,7 @@ jobs:
           cat requirements.txt
 
       - name: Set up LXD
-        uses: canonical/setup-lxd@7be523c4c2724a31218a627809044c6a2f0870ad
+        uses: canonical/setup-lxd@e815787b53c690d006e582ef03e43f08d56d64ba
         with:
           channel: 5.0/stable
 

.github/workflows/db-charm-tests.yaml

@@ -10,13 +10,13 @@ jobs:
       matrix:
         include:
           - charm-repo: canonical/postgresql-operator
-            commit: 4feeaeee102cbf5e3dada3c05d44e0495ca68f9a  # rev409 2024-05-21T12:52:24Z
+            commit: 85f92e9a7121a1f506a550662c066343612a29e6  # 2024-05-31T11:54:37Z
           - charm-repo: canonical/postgresql-k8s-operator
-            commit: 1a25c3929747beea7e78467b169b2b345b29d470  # 2024-05-21T12:40:19Z
+            commit: 7e8862e2f02cfe1f8e768d6ad54a281833afdfda  # rev268 2024-05-31T11:54:09Z
           - charm-repo: canonical/mysql-operator
             commit: 19633f3e904d1c3296477b3df191d1ca265fc0d5  # rev234 2024-05-06T12:13:54Z
           - charm-repo: canonical/mysql-k8s-operator
-            commit: 6c09910bc3bd88eb632793d08fa17340c6903cb2  # rev138 2024-05-01T18:08:13Z
+            commit: d310ba925b667345dc2d1b9b5c953881dd14322a  # 2024-05-29T12:07:56Z
     steps:
       - name: Checkout the ${{ matrix.charm-repo }} repository
         uses: actions/checkout@v4

.github/workflows/observability-charm-tests.yaml

@@ -11,11 +11,11 @@ jobs:
       matrix:
         include:
           - charm-repo: canonical/alertmanager-k8s-operator
-            commit: 90b85c79dfdeeeedcc538c92dcbc26fb2b931088  # rev114 2024-05-23T12:09:22Z
+            commit: 81612b18bf4e9cee072387e75ebd34dff3c189ce  # rev119 2024-06-02T12:08:25Z
           - charm-repo: canonical/prometheus-k8s-operator
             commit: 41b10003b2e7aba34e26fa387af4297d97ecb535  # rev189 2024-05-21T21:25:20Z
           - charm-repo: canonical/grafana-k8s-operator
-            commit: ec74910fc60848594ce44da3b549ad18aa6528aa  # rev113 2024-05-21T14:31:49Z
+            commit: fd6a7da88fa044709be69a4c733d879eb7175b54  # rev114 2024-05-29T09:55:04Z
     steps:
       - name: Checkout the ${{ matrix.charm-repo }} repository
         uses: actions/checkout@v4

HACKING.md

@@ -291,15 +291,18 @@ To make a release of the ops library, do the following:
 7. Create a new branch, and copy this text to the [CHANGES.md](CHANGES.md) file,
    stripping out links, who did each commit, the new contributor list, and the
    link to the full changelog.
-8. Change [version.py][ops/version.py]'s `version` to the
+8. Change [version.py](ops/version.py)'s `version` to the
    [appropriate string](https://semver.org/).
-9. Add, commit, and push, and open a PR to get the changelog and version bump
+9. Check if there's a `chore: update charm pins` auto-generated PR in the queue. If it looks
+   good, merge it and check that tests still pass. If needed, you can re-trigger the
+   `Update Charm Pins` workflow manually to ensure latest charms and ops get tested.
+10. Add, commit, and push, and open a PR to get the changelog and version bump
    into main (and get it merged).
-10. Back in the GitHub releases page, tweak the release notes - for example,
+11. Back in the GitHub releases page, tweak the release notes - for example,
    you might want to have a short paragraph at the intro on particularly
    noteworthy changes.
-11. Have someone else in the Charm-Tech team proofread the release notes.
-12. When you are ready, click "Publish". (If you are not ready, click "Save as Draft".)
+12. Have someone else in the Charm-Tech team proofread the release notes.
+13. When you are ready, click "Publish". (If you are not ready, click "Save as Draft".)
 
 This will trigger an automatic build for the Python package and publish it to
 [PyPI](https://pypi.org/project/ops/)) (authorisation is handled via a
@@ -312,6 +315,6 @@ You can troubleshoot errors on the [Actions Tab](https://github.com/canonical/op
 
 13. Announce the release on [Discourse](https://discourse.charmhub.io/c/framework/42) and [Matrix](https://matrix.to/#/#charmhub-charmdev:ubuntu.com)
 
-14. Open a PR to change [version.py][ops/version.py]'s `version` to the expected
-   next version, with "+dev" appended (for example, if 3.14.1 is the next expected version, use
+14. Open a PR to change [version.py](ops/version.py)'s `version` to the expected
+   next version, with ".dev0" appended (for example, if 3.14.1 is the next expected version, use
    `'3.14.1.dev0'`).

test/pebble_cli.py

@@ -246,9 +246,8 @@ def main():
                     if stderr:
                         print(repr(stderr), end='', file=sys.stderr)
                 sys.exit(0)
-            # The `[str]` here is to resolve the same issue as above.
-            except pebble.ExecError[str] as e:
-                print('ExecError:', e, file=sys.stderr)
+            except pebble.ExecError as e:  # type: ignore
+                print('ExecError:', e, file=sys.stderr)  # type: ignore
                 sys.exit(e.exit_code)
 
         elif args.command == 'ls':