diff --git a/RELEASE_NOTES.rst b/RELEASE_NOTES.rst index 635bb607d..b2f8e1d8a 100644 --- a/RELEASE_NOTES.rst +++ b/RELEASE_NOTES.rst @@ -22,6 +22,7 @@ Release notes * The Pipistrello port now has exclusively TTLs. * The DDS class names and setup options have changed, this requires an update of the device database. +* ``int(a, width=b)`` has been removed. Use ``int32(a)`` and ``int64(a)``. 2.0 diff --git a/artiq/gateware/rtio/phy/ttl_serdes_7series.py b/artiq/gateware/rtio/phy/ttl_serdes_7series.py index 846cc6fc3..e1d5278f5 100644 --- a/artiq/gateware/rtio/phy/ttl_serdes_7series.py +++ b/artiq/gateware/rtio/phy/ttl_serdes_7series.py @@ -107,6 +107,7 @@ class Inout_8X(ttl_serdes_generic.Inout): self.submodules += serdes ttl_serdes_generic.Inout.__init__(self, serdes) + class Input_8X(ttl_serdes_generic.Inout): def __init__(self, pad, pad_n=None): serdes = _ISERDESE2_8X(pad, pad_n) diff --git a/artiq/protocols/pc_rpc.py b/artiq/protocols/pc_rpc.py index bf3f1c12b..f2acd9bfc 100644 --- a/artiq/protocols/pc_rpc.py +++ b/artiq/protocols/pc_rpc.py @@ -11,6 +11,7 @@ client passes a list as a parameter of an RPC method, and that method client's list. """ +import os import socket import asyncio import threading @@ -592,7 +593,11 @@ def simple_server_loop(targets, host, port, description=None): See ``Server`` for a description of the parameters. """ - loop = asyncio.get_event_loop() + if os.name == "nt": + loop = asyncio.ProactorEventLoop() + asyncio.set_event_loop(loop) + else: + loop = asyncio.get_event_loop() try: server = Server(targets, description, True) loop.run_until_complete(server.start(host, port))