From 34421ee2f46badf470ae0edc1bba3f8369cbcaa9 Mon Sep 17 00:00:00 2001 From: Chris Ballance Date: Tue, 28 Feb 2017 10:38:46 +0000 Subject: [PATCH] conda: use anaconda default pyqt (fixes #670) --- conda/artiq-dev/meta.yaml | 2 +- conda/artiq/meta.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conda/artiq-dev/meta.yaml b/conda/artiq-dev/meta.yaml index c2c0b85ec..db530e828 100644 --- a/conda/artiq-dev/meta.yaml +++ b/conda/artiq-dev/meta.yaml @@ -36,7 +36,7 @@ requirements: - sphinx_rtd_theme - h5py - dateutil - - pyqt5 + - pyqt - quamash - pyqtgraph - pygit2 diff --git a/conda/artiq/meta.yaml b/conda/artiq/meta.yaml index dea51840f..8bc640b2c 100644 --- a/conda/artiq/meta.yaml +++ b/conda/artiq/meta.yaml @@ -28,7 +28,7 @@ requirements: - asyncserial - h5py - dateutil - - pyqt5 + - pyqt - quamash - pyqtgraph - pygit2