Skip to content

Commit

Permalink
doc: mocking artiq
Browse files Browse the repository at this point in the history
  • Loading branch information
jordens committed Jul 19, 2017
1 parent fdb27e9 commit b15c76c
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 3 deletions.
14 changes: 13 additions & 1 deletion doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,19 @@ def __getattr__(name):
return Mock()


mock_modules = ["numpy", "scipy", "scipy.interpolate", "serial"]
mock_modules = [
"numpy",
"scipy",
"scipy.interpolate",
"serial",
"artiq",
"artiq.protocols",
"artiq.tools",
"artiq.language",
"artiq.language.core",
"artiq.coredevice",
"artiq.protocols.pc_rpc",
]

for module in mock_modules:
sys.modules[module] = Mock()
Expand Down
3 changes: 2 additions & 1 deletion pdq/artiq/aqctl_pdq.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@

from pdq.host.usb import PDQ
from artiq.protocols.pc_rpc import simple_server_loop
from artiq.tools import *
from artiq.tools import (verbosity_args, simple_network_args, init_logger,
bind_address_from_args)


def get_argparser():
Expand Down
2 changes: 1 addition & 1 deletion pdq/artiq/mediator.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from artiq.language import *
from artiq.language import us, ns, delay_mu, at_mu, kernel, portable, s


frame_setup = 1.5*us
Expand Down

0 comments on commit b15c76c

Please sign in to comment.