From 99196986c08589a67435ab076622655647cc4c17 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Thu, 13 Apr 2017 00:55:16 +0800 Subject: [PATCH] conda: use conda-forge and depend on pyqtgraph 0.10.0 (#704) --- RELEASE_NOTES.rst | 6 ++++++ conda/artiq/meta.yaml | 2 +- doc/manual/installing.rst | 6 +++++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/RELEASE_NOTES.rst b/RELEASE_NOTES.rst index 15d1166a2..7dc5e73d2 100644 --- a/RELEASE_NOTES.rst +++ b/RELEASE_NOTES.rst @@ -32,6 +32,12 @@ Release notes * LinearScan and RandomScan have been consolidated into RangeScan. +2.3 +--- + +* When using conda, add the conda-forge channel before installing ARTIQ. + + 2.2 --- diff --git a/conda/artiq/meta.yaml b/conda/artiq/meta.yaml index 703f73b22..4bebcdc53 100644 --- a/conda/artiq/meta.yaml +++ b/conda/artiq/meta.yaml @@ -30,7 +30,7 @@ requirements: - dateutil - pyqt >=5.5 - quamash - - pyqtgraph + - pyqtgraph 0.10.0 - pygit2 - aiohttp - levenshtein diff --git a/doc/manual/installing.rst b/doc/manual/installing.rst index 0159821ec..625fe0259 100644 --- a/doc/manual/installing.rst +++ b/doc/manual/installing.rst @@ -32,7 +32,11 @@ Executing just ``conda`` should print the help of the ``conda`` command [1]_. Installing the ARTIQ packages ----------------------------- -Add the M-Labs ``main`` Anaconda package repository containing stable releases and release candidates to your conda configuration:: +First add the conda-forge repository containing ARTIQ dependencies to your conda configuration:: + + $ conda config --add channels http://conda.anaconda.org/conda-forge/label/main + +Then add the M-Labs ``main`` Anaconda package repository containing stable releases and release candidates:: $ conda config --add channels http://conda.anaconda.org/m-labs/label/main