M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 1
Code Issues Projects Releases Wiki Activity

stop using explicit ProactorEventLoop on Windows 

It is now the default in Python.
This commit is contained in:
Sebastien Bourdeauducq 2021-12-14 20:06:38 +08:00
parent 352317df11
commit 9e5e234af3
3 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
artiq/frontend/artiq_master.py
View File

@ -3,7 +3,6 @@
import asyncio import asyncio
import argparse import argparse
import atexit import atexit
import os
import logging import logging
from sipyco.pc_rpc import Server as RPCServer from sipyco.pc_rpc import Server as RPCServer
@ -75,11 +74,7 @@ class MasterConfig:
def main(): def main():
args = get_argparser().parse_args() args = get_argparser().parse_args()
log_forwarder = init_log(args) log_forwarder = init_log(args)
if os.name == "nt": loop = asyncio.get_event_loop()
loop = asyncio.ProactorEventLoop()
asyncio.set_event_loop(loop)
else:
loop = asyncio.get_event_loop()
atexit.register(loop.close) atexit.register(loop.close)
bind = common_args.bind_address_from_args(args) bind = common_args.bind_address_from_args(args)

6
artiq/test/test_scheduler.py
View File

@ -2,7 +2,6 @@ import unittest
import logging import logging
import asyncio import asyncio
import sys import sys
import os
from time import time, sleep from time import time, sleep
from artiq.experiment import * from artiq.experiment import *
@ -87,10 +86,7 @@ class _RIDCounter:
class SchedulerCase(unittest.TestCase): class SchedulerCase(unittest.TestCase):
def setUp(self): def setUp(self):
if os.name == "nt": self.loop = asyncio.new_event_loop()
self.loop = asyncio.ProactorEventLoop()
else:
self.loop = asyncio.new_event_loop()
asyncio.set_event_loop(self.loop) asyncio.set_event_loop(self.loop)
def test_steps(self): def test_steps(self):

6
artiq/test/test_worker.py
View File

@ -2,7 +2,6 @@ import unittest
import logging import logging
import asyncio import asyncio
import sys import sys
import os
from time import sleep from time import sleep
from artiq.experiment import * from artiq.experiment import *
@ -77,10 +76,7 @@ def _run_experiment(class_name):
class WorkerCase(unittest.TestCase): class WorkerCase(unittest.TestCase):
def setUp(self): def setUp(self):
if os.name == "nt": self.loop = asyncio.new_event_loop()
self.loop = asyncio.ProactorEventLoop()
else:
self.loop = asyncio.new_event_loop()
asyncio.set_event_loop(self.loop) asyncio.set_event_loop(self.loop)
def test_simple_run(self): def test_simple_run(self):