From 4c22d64ee438d8b65ba728829794698191719181 Mon Sep 17 00:00:00 2001 From: Robert Jordens Date: Tue, 30 Jan 2018 08:36:55 +0100 Subject: [PATCH] conda: sync artiq/artiq-dev dependencies --- conda/artiq-dev/meta.yaml | 2 +- conda/artiq/meta.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conda/artiq-dev/meta.yaml b/conda/artiq-dev/meta.yaml index 86797ac9d..4b5abf404 100644 --- a/conda/artiq-dev/meta.yaml +++ b/conda/artiq-dev/meta.yaml @@ -38,7 +38,7 @@ requirements: - python-dateutil - pyqt >=5.5 - quamash - - pyqtgraph + - pyqtgraph 0.10.0 - pygit2 - aiohttp - pythonparser >=1.1 diff --git a/conda/artiq/meta.yaml b/conda/artiq/meta.yaml index 3ba815985..065c4150b 100644 --- a/conda/artiq/meta.yaml +++ b/conda/artiq/meta.yaml @@ -27,9 +27,9 @@ requirements: run: - python >=3.5.3,<3.6 - llvmlite-artiq 0.20.0 - - binutils-or1k-linux + - binutils-or1k-linux >=2.27 - pythonparser >=1.1 - - openocd 0.10.0+git1 + - openocd 0.10.0 4 - lit - outputcheck - scipy