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: f7dec72f022a
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: c155fd3849b7
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Jan 26, 2017

  1. Copy the full SHA
    653eee0 View commit details
  2. Copy the full SHA
    c155fd3 View commit details
Showing with 19 additions and 8 deletions.
  1. +8 −7 artiq/frontend/artiq_flash.py
  2. +7 −1 doc/manual/conf.py
  3. +4 −0 doc/manual/requirements.txt
15 changes: 8 additions & 7 deletions artiq/frontend/artiq_flash.py
Original file line number Diff line number Diff line change
@@ -11,12 +11,13 @@
from artiq.frontend.bit2bin import bit2bin


scripts_path = ["share", "openocd", "scripts"]
if os.name == "nt":
scripts_path.insert(0, "Library")
scripts_path = os.path.abspath(os.path.join(
os.path.dirname(shutil.which("openocd")),
"..", *scripts_path))
def scripts_path():
scripts_path = ["share", "openocd", "scripts"]
if os.name == "nt":
scripts_path.insert(0, "Library")
scripts_path = os.path.abspath(os.path.join(
os.path.dirname(shutil.which("openocd")),
"..", *scripts_path))


def get_argparser():
@@ -139,7 +140,7 @@ def main():
target_file = opts.target_file
subprocess.check_call([
"openocd",
"-s", scripts_path,
"-s", scripts_path(),
"-f", target_file,
"-c", "; ".join(prog),
])
8 changes: 7 additions & 1 deletion doc/manual/conf.py
Original file line number Diff line number Diff line change
@@ -28,7 +28,13 @@ def __getattr__(cls, name):
return Mock()


mock_modules = ["artiq.gui.moninj", "quamash", "pyqtgraph", "matplotlib"]
mock_modules = ["artiq.gui.moninj",
"artiq.gui.waitingspinnerwidget",
"artiq.gui.flowlayout",
"quamash", "pyqtgraph", "matplotlib",
"numpy", "dateutil", "dateutil.parser", "prettytable", "PyQt5",
"h5py", "serial", "scipy", "scipy.interpolate", "asyncserial",
"llvmlite_artiq", "Levenshtein", "aiohttp"]

for module in mock_modules:
sys.modules[module] = Mock()
4 changes: 4 additions & 0 deletions doc/manual/requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
sphinx_rtd_theme
sphinx-argparse
sphinxcontrib-wavedrom
pythonparser