Merge branch 'master' into bug/bundle/channel-default-value

Author: juanmanuel-tirado

.github/workflows/tox.yaml

@@ -8,7 +8,13 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python: [3.5, 3.6, 3.7, 3.8, 3.9]
+        python:
+          - "3.5"
+          - "3.6"
+          - "3.7"
+          - "3.8"
+          - "3.9"
+          - "3.10"
     steps:
     - name: Check out code
       uses: actions/checkout@v2
@@ -25,7 +31,13 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python: [3.5, 3.6, 3.7, 3.8, 3.9]
+        python:
+          - "3.5"
+          - "3.6"
+          - "3.7"
+          - "3.8"
+          - "3.9"
+          - "3.10"
     steps:
       - uses: actions/checkout@v2
       - name: Setup Python

VERSION

@@ -1 +1 @@
-2.9.8
+2.9.10

docs/changelog.rst

@@ -1,13 +1,36 @@
 Changelog
 ---------
 
+2.9.10
+^^^^^^
+
+Thursday June 9 2022
+
+## What's Changed
+
+* [JUJU-1155] Avoid incorrectly setting `series: kubernetes` for sidecar charms in k8s bundles by @cderici in https://github.com/juju/python-libjuju/pull/679
+* [JUJU-1172] Visiting the pylibjuju CI by @cderici in https://github.com/juju/python-libjuju/pull/681
+* [JUJU-1124] Avoid sending path across the wire for local resource file name by @cderici in https://github.com/juju/python-libjuju/pull/678
+
+2.9.9
+^^^^^
+
+Wednesday April 26 2022
+
+* [JUJU-835] Avoid ignoring asyncio exceptions in coroutines by @cderici in https://github.com/juju/python-libjuju/pull/658
+* [JUJU-843] Attach-resource to check if given binary file by @cderici in https://github.com/juju/python-libjuju/pull/659
+* [JUJU-858] Add quality of life feature ensure application removal at return by @cderici in https://github.com/juju/python-libjuju/pull/665
+* [JUJU-965] Add a bit of client side constraint validation by @cderici in https://github.com/juju/python-libjuju/pull/666
+* support python3.10 with later versions of websockets by @addyess in https://github.com/juju/python-libjuju/pull/673
+* Revert "Avoid ignoring asyncio exceptions in coroutines" by @simskij in https://github.com/juju/python-libjuju/pull/672
+* [JUJU-796] Add relate method and deprecate add-relation by @jack-w-shaw in https://github.com/juju/python-libjuju/pull/660
+* [JUJU-981] Get series from deployed app instead of metadata when charm upgrade by @cderici in https://github.com/juju/python-libjuju/pull/671
+
 2.9.8
 ^^^^^
 
 Monday March 21 2022
 
-## What's Changed
-
 * [JUJU-567] Use ModelManager instead of ControllerFacade to list available models by @cderici in https://github.com/juju/python-libjuju/pull/632
 * [JUJU-573] Fix charm resolution for Juju 2.8.11 by @cderici in https://github.com/juju/python-libjuju/pull/633
 * [JUJU-704] Remove non-implemented (stuıb) functions by @cderici in https://github.com/juju/python-libjuju/pull/646
@@ -17,7 +40,6 @@ Monday March 21 2022
 * [JUJU-769] Facade schemas for 2.9.27 by @cderici in https://github.com/juju/python-libjuju/pull/652
 * [JUJU-771] Auto switch to scale from add_unit on container based models by @cderici in https://github.com/juju/python-libjuju/pull/653
 
-
 2.9.7
 ^^^^^
 

docs/narrative/application.rst

@@ -95,7 +95,7 @@ application. The `mysql_app` object is an instance of
 
 Adding and Removing Relations
 -----------------------------
-The :meth:`juju.application.Application.add_relation` method returns a
+The :meth:`juju.application.Application.relate` method returns a
 :class:`juju.relation.Relation` instance.
 
 .. code:: python
@@ -122,7 +122,7 @@ The :meth:`juju.application.Application.add_relation` method returns a
   )
 
   # Add the master-slave relation
-  relation = await mysql_master.add_relation(
+  relation = await mysql_master.relate(
       # Name of the relation on the local (mysql-master) side
       'master',
       # Name of the app:relation on the remote side

docs/readme.rst

@@ -36,6 +36,7 @@ Installation
 
 Quickstart
 ----------
+
 Here's a simple example that shows basic usage of the library. The example
 connects to the currently active Juju model, deploys a single unit of the
 ubuntu charm, then exits:
@@ -48,7 +49,7 @@ ubuntu charm, then exits:
   import logging
   import sys
 
-  from juju import loop
+  from juju import jasyncio
   from juju.model import Model
 
 
@@ -87,7 +88,7 @@ ubuntu charm, then exits:
 
       # Run the deploy coroutine in an asyncio event loop, using a helper
       # that abstracts loop creation and teardown.
-      loop.run(deploy())
+      jasyncio.run(deploy())
 
 
   if __name__ == '__main__':
@@ -103,6 +104,25 @@ example, to run ``examples/connect_current_model.py``, use:
   tox -e example -- examples/connect_current_model.py
 
 
+REPL
+^^^^
+
+To experiment with the library in a REPL, launch python in asyncio mode
+
+.. code:: bash
+
+  $ python3 -m asyncio
+
+and then, to connect to the current model and fetch status:
+
+.. code::
+
+  >>> from juju.model import Model
+  >>> model = Model()
+  >>> await model.connect_current()
+  >>> status = await model.get_status()
+
+
 Versioning
 ----------
 

examples/charms/onos.charm

@@ -0,0 +1,7 @@
+venv/
+build/
+*.charm
+
+.coverage
+__pycache__/
+*.py[cod]

examples/charms/ubuntu/.gitignore

@@ -0,0 +1,3 @@
+/venv
+*.py[cod]
+*.charm

examples/charms/ubuntu/.jujuignore

@@ -0,0 +1,34 @@
+# ubuntu
+
+## Developing
+
+Create and activate a virtualenv with the development requirements:
+
+    virtualenv -p python3 venv
+    source venv/bin/activate
+    pip install -r requirements-dev.txt
+
+## Code overview
+
+TEMPLATE-TODO:
+One of the most important things a consumer of your charm (or library)
+needs to know is what set of functionality it provides. Which categories
+does it fit into? Which events do you listen to? Which libraries do you
+consume? Which ones do you export and how are they used?
+
+## Intended use case
+
+TEMPLATE-TODO:
+Why were these decisions made? What's the scope of your charm?
+
+## Roadmap
+
+If this Charm doesn't fulfill all of the initial functionality you were
+hoping for or planning on, please add a Roadmap or TODO here
+
+## Testing
+
+The Python operator framework includes a very nice harness for testing
+operator behaviour without full deployment. Just `run_tests`:
+
+    ./run_tests