Merge branch 'main' into backports

debian/control

@@ -67,10 +67,10 @@ Description:
     .
     #!/usr/bin/python3
     .
+    import asyncio
     import logging
     import sys
     .
-    from juju import loop
     from juju.model import Model
     .
     .
@@ -107,9 +107,7 @@ Description:
         ws_logger = logging.getLogger('websockets.protocol')
         ws_logger.setLevel(logging.INFO)
     .
-        # Run the deploy coroutine in an asyncio event loop, using a helper
-        # that abstracts loop creation and teardown.
-        loop.run(deploy())
+        asyncio.run(deploy())
     .
     .
     if __name__ == '__main__':

docs/api/modules.rst

@@ -2,7 +2,6 @@ Public APIs
 ===========
 
 It is recommended that you start with :doc:`juju.model` or :doc:`juju.controller`.
-If you need helpers to manage the asyncio loop, try :doc:`juju.loop`.
 
 .. toctree::
 
@@ -16,7 +15,6 @@ If you need helpers to manage the asyncio loop, try :doc:`juju.loop`.
     juju.errors
     juju.exceptions
     juju.juju
-    juju.loop
     juju.machine
     juju.model
     juju.placement

examples/action.py

@@ -10,9 +10,9 @@
 
 """
 
+import asyncio
 import logging
 
-from juju import jasyncio
 from juju.model import Model
 
 
@@ -50,4 +50,4 @@ async def main():
     logging.basicConfig(level=logging.DEBUG)
     ws_logger = logging.getLogger("websockets.protocol")
     ws_logger.setLevel(logging.INFO)
-    jasyncio.run(main())
+    asyncio.run(main())

examples/add_k8s.py

@@ -10,13 +10,13 @@
 
 """
 
+import asyncio
 import base64
 import logging
 import os
 
 import yaml
 
-from juju import jasyncio
 from juju.client import client
 from juju.controller import Controller
 
@@ -58,4 +58,4 @@ async def main():
     logging.basicConfig(level=logging.DEBUG)
     ws_logger = logging.getLogger("websockets.protocol")
     ws_logger.setLevel(logging.INFO)
-    jasyncio.run(main())
+    asyncio.run(main())

examples/add_machine.py

@@ -11,9 +11,9 @@
 
 """
 
+import asyncio
 import logging
 
-from juju import jasyncio
 from juju.model import Model
 
 MB = 1
@@ -69,4 +69,4 @@ async def main():
     ws_logger = logging.getLogger("websockets.protocol")
     ws_logger.setLevel(logging.INFO)
 
-    jasyncio.run(main())
+    asyncio.run(main())

examples/add_model.py

@@ -13,7 +13,7 @@
 import uuid
 from logging import getLogger
 
-from juju import jasyncio, utils
+from juju import utils
 from juju.controller import Controller
 
 LOG = getLogger(__name__)
@@ -65,4 +65,4 @@ async def main():
 
 
 if __name__ == "__main__":
-    jasyncio.run(main())
+    asyncio.run(main())

examples/add_secrets_backend.py

@@ -1,9 +1,10 @@
 # Copyright 2023 Canonical Ltd.
 # Licensed under the Apache V2, see LICENCE file for details.
 
+import asyncio
+
 import hvac
 
-from juju import jasyncio
 from juju.model import Model
 
 
@@ -75,4 +76,4 @@ async def main():
 
 
 if __name__ == "__main__":
-    jasyncio.run(main())
+    asyncio.run(main())

examples/allwatcher.py

@@ -10,9 +10,9 @@
 
 """
 
+import asyncio
 import logging
 
-from juju import jasyncio
 from juju.client import client
 from juju.model import Model
 
@@ -34,4 +34,4 @@ async def watch():
     ws_logger.setLevel(logging.INFO)
     # Run loop until the process is manually stopped (watch will loop
     # forever).
-    jasyncio.run(watch())
+    asyncio.run(watch())

examples/charmhub_deploy_k8s.py

@@ -9,7 +9,8 @@
 
 """
 
-from juju import jasyncio
+import asyncio
+
 from juju.model import Model
 
 
@@ -40,4 +41,4 @@ async def main():
 
 
 if __name__ == "__main__":
-    jasyncio.run(main())
+    asyncio.run(main())

examples/charmhub_deploy_machine.py

@@ -9,7 +9,8 @@
 
 """
 
-from juju import jasyncio
+import asyncio
+
 from juju.model import Model
 
 
@@ -37,4 +38,4 @@ async def main():
 
 
 if __name__ == "__main__":
-    jasyncio.run(main())
+    asyncio.run(main())

examples/charmhub_find.py

@@ -5,9 +5,9 @@
 repository for charms.
 """
 
+import asyncio
 import logging
 
-from juju import jasyncio
 from juju.model import Model
 
 log = logging.getLogger(__name__)
@@ -33,4 +33,4 @@ async def main():
 
 if __name__ == "__main__":
     logging.basicConfig(level=logging.INFO)
-    jasyncio.run(main())
+    asyncio.run(main())

examples/charmhub_info.py

@@ -5,9 +5,9 @@
 repository for information about a given charm.
 """
 
+import asyncio
 import logging
 
-from juju import jasyncio
 from juju.model import Model
 
 log = logging.getLogger(__name__)
@@ -29,4 +29,4 @@ async def main():
 
 if __name__ == "__main__":
     logging.basicConfig(level=logging.INFO)
-    jasyncio.run(main())
+    asyncio.run(main())

examples/cloud.py

@@ -9,9 +9,9 @@
 
 """
 
+import asyncio
 import logging
 
-from juju import jasyncio
 from juju.controller import Controller
 
 
@@ -28,4 +28,4 @@ async def main():
     logging.basicConfig(level=logging.DEBUG)
     ws_logger = logging.getLogger("websockets.protocol")
     ws_logger.setLevel(logging.INFO)
-    jasyncio.run(main())
+    asyncio.run(main())

examples/clouds.py

@@ -9,9 +9,9 @@
 
 """
 
+import asyncio
 import logging
 
-from juju import jasyncio
 from juju.controller import Controller
 
 
@@ -28,4 +28,4 @@ async def main():
     logging.basicConfig(level=logging.DEBUG)
     ws_logger = logging.getLogger("websockets.protocol")
     ws_logger.setLevel(logging.INFO)
-    jasyncio.run(main())
+    asyncio.run(main())

examples/config.py

@@ -9,9 +9,9 @@
 
 """
 
+import asyncio
 import logging
 
-from juju import jasyncio
 from juju.model import Model
 
 log = logging.getLogger(__name__)
@@ -59,4 +59,4 @@ async def main():
     # logging.basicConfig(level=logging.DEBUG)
     ws_logger = logging.getLogger("websockets.protocol")
     ws_logger.setLevel(logging.INFO)
-    jasyncio.run(main())
+    asyncio.run(main())

examples/connect_current_model.py

@@ -5,9 +5,9 @@
 and prints the number of applications deployed to it.
 """
 
+import asyncio
 import logging
 
-from juju import jasyncio
 from juju.model import Model
 
 log = logging.getLogger(__name__)
@@ -27,4 +27,4 @@ async def main():
 
 if __name__ == "__main__":
     logging.basicConfig(level=logging.INFO)
-    jasyncio.run(main())
+    asyncio.run(main())

examples/controller.py

@@ -11,9 +11,9 @@
 
 """
 
+import asyncio
 import logging
 
-from juju import jasyncio
 from juju.controller import Controller
 
 
@@ -41,4 +41,4 @@ async def main():
     logging.basicConfig(level=logging.DEBUG)
     ws_logger = logging.getLogger("websockets.protocol")
     ws_logger.setLevel(logging.INFO)
-    jasyncio.run(main())
+    asyncio.run(main())

examples/credential.py

@@ -1,9 +1,9 @@
 # Copyright 2023 Canonical Ltd.
 # Licensed under the Apache V2, see LICENCE file for details.
 
+import asyncio
 import sys
 
-from juju import jasyncio
 from juju.controller import Controller
 
 
@@ -47,4 +47,4 @@ async def main(cloud_name, credential_name):
 
 if __name__ == "__main__":
     assert len(sys.argv) > 2, "Please provide a cloud and credential name"
-    jasyncio.run(main(sys.argv[1], sys.argv[2]))
+    asyncio.run(main(sys.argv[1], sys.argv[2]))

examples/crossmodel.py

@@ -11,10 +11,10 @@
 
 """
 
+import asyncio
 import tempfile
 from logging import getLogger
 
-from juju import jasyncio
 from juju.controller import Controller
 
 log = getLogger(__name__)
@@ -83,4 +83,4 @@ async def main():
 
 
 if __name__ == "__main__":
-    jasyncio.run(main())
+    asyncio.run(main())

examples/crossmodel_bundle.py

@@ -13,11 +13,11 @@
 
 """
 
+import asyncio
 import time
 from logging import getLogger
 from pathlib import Path
 
-from juju import jasyncio
 from juju.controller import Controller
 
 log = getLogger(__name__)
@@ -87,4 +87,4 @@ async def main():
 
 
 if __name__ == "__main__":
-    jasyncio.run(main())
+    asyncio.run(main())

examples/crossmodel_controller.py

@@ -15,10 +15,10 @@
 10. Destroys models and disconnects
 """
 
+import asyncio
 import tempfile
 from logging import getLogger
 
-from juju import jasyncio
 from juju.controller import Controller
 
 log = getLogger(__name__)
@@ -92,4 +92,4 @@ async def main():
 
 
 if __name__ == "__main__":
-    jasyncio.run(main())
+    asyncio.run(main())

examples/crossmodel_relation.py

@@ -13,11 +13,11 @@
 
 """
 
+import asyncio
 import tempfile
 import time
 from logging import getLogger
 
-from juju import jasyncio
 from juju.controller import Controller
 
 log = getLogger(__name__)
@@ -106,4 +106,4 @@ async def main():
 
 
 if __name__ == "__main__":
-    jasyncio.run(main())
+    asyncio.run(main())