* 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
...
* 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
* master:
gui/experiments: float/bring into focus already open docks when opening experiments
gui: reduce size of console dock
protocols/logging,pc_rpc: do not print errors on Windows when clients disconnect
gui: reduce size of schedule dock
worker: Windows VMs are slow, increase send_timeout
protocol/sync_struct: Windows also raises ConnectionAbortedError on disconnection
gui: reduce size of log dock
gui: reduce size of experiment dock
protocols/logging/LogParser: handle Windows CRLF
pyon: handle \r
test/pipe_ipc: re-enable
protocols/asyncio_server: minor cleanup
protocols/pipe_ipc: Windows support
Revert "Revert "test/pipe_ipc: temporarily skip test""
Revert "try debugging weird unittest failure"
try debugging weird unittest failure
conda: restrict binutils-or1k-linux dependency to linux.
transforms.iodelay_estimator: make diagnostics much more clear.
Fix typo.
perl -i -pe 's/^from artiq import \*$/from artiq.experiment import */' your_experiments/*.py
(assuming you skipped the changes form the previous commit)