srenblad
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

conda: use conda-forge and depend on pyqtgraph 0.10.0 (#704)

This commit is contained in:
Sebastien Bourdeauducq 2017-04-13 00:55:16 +08:00
parent 31048f4b6a
commit 99196986c0
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
RELEASE_NOTES.rst
View File

@ -32,6 +32,12 @@ Release notes
* LinearScan and RandomScan have been consolidated into RangeScan. * LinearScan and RandomScan have been consolidated into RangeScan.
2.3
---
* When using conda, add the conda-forge channel before installing ARTIQ.
2.2 2.2
--- ---

2
conda/artiq/meta.yaml
View File

@ -30,7 +30,7 @@ requirements:
- dateutil - dateutil
- pyqt >=5.5 - pyqt >=5.5
- quamash - quamash
- pyqtgraph - pyqtgraph 0.10.0
- pygit2 - pygit2
- aiohttp - aiohttp
- levenshtein - levenshtein

6
doc/manual/installing.rst
View File

@ -32,7 +32,11 @@ Executing just ``conda`` should print the help of the ``conda`` command [1]_.
Installing the ARTIQ packages 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 $ conda config --add channels http://conda.anaconda.org/m-labs/label/main