From ca614a3eea94233d23c30882be0366efe21f74ba Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Tue, 31 May 2022 22:25:43 +0800
Subject: [PATCH] use asyncio get/new_event_loop as recommended

---
 artiq/frontend/aqctl_corelog.py      |  3 ++-
 artiq/frontend/aqctl_moninj_proxy.py |  3 ++-
 artiq/frontend/artiq_client.py       |  3 ++-
 artiq/frontend/artiq_master.py       |  3 ++-
 artiq/frontend/artiq_rtiomon.py      |  3 ++-
 artiq/test/coredevice/test_moninj.py |  3 ++-
 flake.lock                           | 12 ++++++------
 7 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/artiq/frontend/aqctl_corelog.py b/artiq/frontend/aqctl_corelog.py
index c86c276d5..ca0827585 100755
--- a/artiq/frontend/aqctl_corelog.py
+++ b/artiq/frontend/aqctl_corelog.py
@@ -76,7 +76,8 @@ def main():
     args = get_argparser().parse_args()
     common_args.init_logger_from_args(args)
 
-    loop = asyncio.get_event_loop()
+    loop = asyncio.new_event_loop()
+    asyncio.set_event_loop(loop)
     try:
         signal_handler = SignalHandler()
         signal_handler.setup()
diff --git a/artiq/frontend/aqctl_moninj_proxy.py b/artiq/frontend/aqctl_moninj_proxy.py
index 5d7aca2a3..54d8d0833 100755
--- a/artiq/frontend/aqctl_moninj_proxy.py
+++ b/artiq/frontend/aqctl_moninj_proxy.py
@@ -196,7 +196,8 @@ def main():
 
     bind_address = common_args.bind_address_from_args(args)
 
-    loop = asyncio.get_event_loop()
+    loop = asyncio.new_event_loop()
+    asyncio.set_event_loop(loop)
     try:
         signal_handler = SignalHandler()
         signal_handler.setup()
diff --git a/artiq/frontend/artiq_client.py b/artiq/frontend/artiq_client.py
index 993fe0ee4..8601fed77 100755
--- a/artiq/frontend/artiq_client.py
+++ b/artiq/frontend/artiq_client.py
@@ -245,7 +245,8 @@ def _show_datasets(datasets):
 
 
 def _run_subscriber(host, port, subscriber):
-    loop = asyncio.get_event_loop()
+    loop = asyncio.new_event_loop()
+    asyncio.set_event_loop(loop)
     try:
         loop.run_until_complete(subscriber.connect(host, port))
         try:
diff --git a/artiq/frontend/artiq_master.py b/artiq/frontend/artiq_master.py
index 2b8893d07..42a7a0a98 100755
--- a/artiq/frontend/artiq_master.py
+++ b/artiq/frontend/artiq_master.py
@@ -74,7 +74,8 @@ class MasterConfig:
 def main():
     args = get_argparser().parse_args()
     log_forwarder = init_log(args)
-    loop = asyncio.get_event_loop()
+    loop = asyncio.new_event_loop()
+    asyncio.set_event_loop(loop)
     atexit.register(loop.close)
     signal_handler = SignalHandler()
     signal_handler.setup()
diff --git a/artiq/frontend/artiq_rtiomon.py b/artiq/frontend/artiq_rtiomon.py
index 8649f8d5f..653063ce1 100755
--- a/artiq/frontend/artiq_rtiomon.py
+++ b/artiq/frontend/artiq_rtiomon.py
@@ -21,7 +21,8 @@ def get_argparser():
 def main():
     args = get_argparser().parse_args()
 
-    loop = asyncio.get_event_loop()
+    loop = asyncio.new_event_loop()
+    asyncio.set_event_loop(loop)
     try:
         signal_handler = SignalHandler()
         signal_handler.setup()
diff --git a/artiq/test/coredevice/test_moninj.py b/artiq/test/coredevice/test_moninj.py
index 83786a8a1..092f3f7d6 100644
--- a/artiq/test/coredevice/test_moninj.py
+++ b/artiq/test/coredevice/test_moninj.py
@@ -28,7 +28,8 @@ class MonInjTest(ExperimentCase):
         def injection_status_cb(channel, override, value):
             injection_statuses.append((channel, override, value))
 
-        loop = asyncio.get_event_loop()
+        loop = asyncio.new_event_loop()
+        asyncio.set_event_loop(loop)
         try:
             moninj_comm = CommMonInj(monitor_cb, injection_status_cb)
             loop.run_until_complete(moninj_comm.connect(core_host))
diff --git a/flake.lock b/flake.lock
index 08de34c19..4a5d51030 100644
--- a/flake.lock
+++ b/flake.lock
@@ -10,11 +10,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1654001815,
-        "narHash": "sha256-wMVXlnMh64cWfG0LNpDExAGL5iHNoCstmVkOVr31NSE=",
+        "lastModified": 1654007592,
+        "narHash": "sha256-vaDFhE1ItjqtIcinC/6RAJGbj44pxxMUEeQUa3FtgEE=",
         "owner": "m-labs",
         "repo": "artiq-comtools",
-        "rev": "2b4899ecddfaac160f92341377262ac61d6329b7",
+        "rev": "cb73281154656ee8f74db1866859e31bf42755cd",
         "type": "github"
       },
       "original": {
@@ -73,11 +73,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1654001788,
-        "narHash": "sha256-vUSep33N66pcvy7ojnBLSmyyVfN20+WZvP/c4b0T2CI=",
+        "lastModified": 1654006751,
+        "narHash": "sha256-OWAnoTCutvTQcYdtdtLQuL6uRtG+7Jz7sbRhcScv8bo=",
         "owner": "m-labs",
         "repo": "sipyco",
-        "rev": "951de4cf198419712ea3f52991d8f9293f3d9d15",
+        "rev": "b3d03a94c751a24769c54a61a0dbe9d6af52dade",
         "type": "github"
       },
       "original": {