Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/artiq
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 37c7ea31c369
Choose a base ref
...
head repository: m-labs/artiq
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 398940f5ac59
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Jun 5, 2015

  1. style

    @sbourdeauducq
    sbourdeauducq committed Jun 5, 2015
    Copy the full SHA
    26e737f View commit details

  2. fix doc build

    @sbourdeauducq
    sbourdeauducq committed Jun 5, 2015
    Copy the full SHA
    398940f View commit details
Showing with 4 additions and 4 deletions.
  1. +2 −2 artiq/test/sync_struct.py
  2. +2 −2 doc/manual/conf.py
4 changes: 2 additions & 2 deletions artiq/test/sync_struct.py
View file
Original file line number Diff line number Diff line change
@@ -37,8 +37,8 @@ def init_test_dict(self, init):
return init

def notify(self, mod):
if (mod["action"] == "init" and "finished" in mod["struct"])\
or (mod["action"] == "setitem" and mod["key"] == "finished"):
if ((mod["action"] == "init" and "finished" in mod["struct"])
or (mod["action"] == "setitem" and mod["key"] == "finished")):
self.receiving_done.set()

def setUp(self):
4 changes: 2 additions & 2 deletions doc/manual/conf.py
View file
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@ def __getattr__(cls, name):
return Mock()


mock_modules = ["quamash", "pyqtgraph", "matplotlib"]
mock_modules = ["artiq.gui.moninj", "quamash", "pyqtgraph", "matplotlib"]

for module in mock_modules:
sys.modules[module] = Mock()
@@ -118,7 +118,7 @@ def __getattr__(cls, name):

# The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes.
html_theme = 'default'
html_theme = 'classic'

# Theme options are theme-specific and customize the look and feel of a theme
# further. For a list of options available for each theme, see the