From 1572d852aa0954cf3c4b3340aa90519236e55328 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Thu, 13 Apr 2017 00:58:04 +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 86d9dbd90..a6c56a84a 100644
--- a/RELEASE_NOTES.rst
+++ b/RELEASE_NOTES.rst
@@ -3,6 +3,12 @@
 Release notes
 =============
 
+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 2681f2c2f..ae87bec45 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 c3090337b..fcb1c6a8d 100644
--- a/doc/manual/installing.rst
+++ b/doc/manual/installing.rst
@@ -31,7 +31,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