6434a9cd5f
Merge branch 'master' into subprocess-termination
...
* master: (44 commits)
Revert "conda: restrict binutils-or1k-linux dependency to linux."
manual/installing: refresh
use https for m-labs.hk
gui/log: top cell alignment
master/log: do not break lines
conda: fix pyqt package name
gui/applets: log warning if IPC address not in command
applets: make sure pyqtgraph imports qt5
applets: avoid argparse subparser mess
examples/histogram: artiq -> artiq.experiment
gui/applets: save dock UID in state
setup.py: give up trying to check for PyQt
setup.py: fix PyQt5 package name
Use Qt5
applets: fix error message text
applets: handle dataset mutations
applets: properly name docks to support state save/restore
applets: clean shutdown
protocols/pyon: set support
protocols/pyon: remove FlatFileDB
...
2016-02-11 09:24:45 +01:00
fcf7a6be2e
Revert "conda: restrict binutils-or1k-linux dependency to linux."
...
This reverts commit 5bead8b83f
2016-02-10 23:42:24 +01:00
b68035d162
manual/installing: refresh
2016-02-10 23:37:21 +01:00
64263b75d0
use https for m-labs.hk
2016-02-10 17:20:29 +01:00
97ba77f4b5
gui/log: top cell alignment
2016-02-10 06:34:11 +01:00
2ce1e6a1e9
master/log: do not break lines
2016-02-10 06:33:41 +01:00
f3f667be5b
conda: fix pyqt package name
2016-02-09 10:47:38 +01:00
d1e54c86b1
gui/applets: log warning if IPC address not in command
2016-02-08 22:39:47 +01:00
338e5fe3fc
Merge branch 'applets_pipeipc'
2016-02-08 22:25:36 +01:00
44a1efa601
applets: make sure pyqtgraph imports qt5
2016-02-08 22:25:20 +01:00
67327b1e61
applets: avoid argparse subparser mess
2016-02-08 22:25:02 +01:00
1a2596de8e
examples/histogram: artiq -> artiq.experiment
2016-02-08 22:24:23 +01:00
4733c4ba1e
gui/applets: save dock UID in state
2016-02-08 21:57:07 +01:00
13a8f9c7ca
setup.py: give up trying to check for PyQt
2016-02-08 19:42:08 +01:00
1830d6a62e
setup.py: fix PyQt5 package name
2016-02-08 19:33:35 +01:00
d873c25b8b
Use Qt5
2016-02-08 19:32:40 +01:00
7584b02d66
applets: fix error message text
2016-02-08 19:23:50 +01:00
de99e7f830
applets: handle dataset mutations
2016-02-08 19:20:07 +01:00
f25b5442e7
applets: properly name docks to support state save/restore
2016-02-08 16:26:02 +01:00
dc955d46c9
Merge branch 'applets'
2016-02-08 14:55:53 +01:00
8844fba4c9
applets: clean shutdown
2016-02-08 14:35:37 +01:00
8be0696b39
protocols/pyon: set support
2016-02-08 14:08:14 +01:00
8a912105cb
protocols/pyon: remove FlatFileDB
2016-02-08 14:05:00 +01:00
741b11c26d
applets: basic embedding OK
2016-02-08 09:59:15 +01:00
912274c6af
test_ctlmgr: fix
2016-02-05 15:08:49 -07:00
70a67a0e38
Merge branch 'applets' into applets_pipeipc
2016-02-05 13:29:20 +01:00
c52081ca0d
Merge remote-tracking branch 'm-labs/newtesting' into subprocess-termination
...
* m-labs/newtesting:
style
assume 'import artiq' works before running tests
test/ctlmgr: use sys.executable, use default localhost binding
2016-02-03 15:00:00 -07:00
ab81dbbd19
Merge remote-tracking branch 'm-labs/master' into subprocess-termination
...
* m-labs/master:
remove pxi6733 support (now lives at https://github.com/m-labs/aq_ni6733
setup.py: remove stale import
remove stale dependency on pyelftools
2016-02-02 23:34:37 -07:00
c28b938471
Client: add note about timeout sideeffects
2016-02-02 15:42:47 -07:00
f7df393248
hardware_testbench: full shutdown sequence for controllers
2016-02-02 15:32:40 -07:00
53e5d0a7bb
worker: flake8 style cleanup
2016-02-02 15:32:40 -07:00
7636952496
ctlmgr: fix import
2016-02-02 15:32:39 -07:00
c105949155
pc_rpc.Client: support socket timeouts
...
... and fix two flake8 errors.
2016-02-02 15:32:39 -07:00
55006119c8
subprocesses: unify termination logic
2016-02-02 15:32:36 -07:00
89f68f3470
style
2016-02-02 21:57:25 +01:00
9ca8b48bf9
assume 'import artiq' works before running tests
2016-02-02 21:52:33 +01:00
ca8a075f46
test/ctlmgr: use sys.executable, use default localhost binding
2016-02-02 21:08:51 +01:00
b7de92e96c
remove pxi6733 support (now lives at https://github.com/m-labs/aq_ni6733
2016-02-02 18:41:57 +01:00
c639860331
setup.py: remove stale import
2016-02-02 17:30:07 +01:00
55b31244ed
remove stale dependency on pyelftools
2016-02-02 17:27:29 +01:00
cf465dae0c
tools/file_import: make sure sys.path is always restored
2016-01-31 20:33:17 +01:00
0d18942869
hardware_testbench: request controller termination
2016-01-30 20:04:32 -07:00
9fb5ef4d86
Merge branch 'increase-runtime-size'
...
closes #250
* increase-runtime-size:
flash: grow runtime limit to 512 kB
RELEASE_NOTES: update
flash storage: move to flash + 0x70000
2016-01-30 18:58:32 -07:00
f14fed5912
examples: add an IPython notebook showcase
...
This is a small example on how to use the artiq functionality in
an IPython notebook. This can be expanded and provides a much more
powerful shell than the one integrated in the GUI. Potentially,
some shared functionality between this and artiq_client could be
factored out.
2016-01-30 18:56:28 -07:00
10d78a5d0b
flash: grow runtime limit to 512 kB
2016-01-30 14:50:15 -07:00
68891493a3
analyzer: move common to artiq.protocols
...
migen was still pulled in through rtio.__init__.py
2016-01-29 20:26:48 -07:00
17ac64a65e
ctlmgr: fix the fix ( 107e2fe)
2016-01-29 17:52:12 -07:00
d05d720b19
tests: misc fixes, cleanup
2016-01-29 17:32:59 -07:00
107e2fedf4
ctlmgr: reinstate lost changes
2016-01-29 17:20:07 -07:00
1d92c0874e
gui/log: use QFontDatabase for fixed font
2016-01-29 23:21:22 +01:00
