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

conda/artiq-dev: fix channel list 

Now, with conda 4.1 packages are sorted by channel, version, build
number in decreasing priority. The highest matching package is
taken. https://conda.io/docs/user-guide/tasks/manage-channels.html

For the artiq-dev environment, the m-labs/label/dev channel should be
first, then the main channel, then defaults, and then conda-forge
(community supported packages).

closes #864
This commit is contained in:
Robert Jördens 2017-12-07 11:08:20 +00:00 committed by Robert Jordens
parent 825f1ff1ce
commit 69b2d1abfc
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
conda/artiq-dev.yaml
View File

@ -2,9 +2,9 @@
# $ conda env create -f conda/artiq-dev.yaml # $ conda env create -f conda/artiq-dev.yaml
name: artiq-dev name: artiq-dev
channels: channels:
- defaults
- conda-forge/label/main
- m-labs/label/dev - m-labs/label/dev
- m-labs/label/main - m-labs/label/main
- defaults
- conda-forge/label/main
dependencies: dependencies:
- artiq-dev - artiq-dev

4
conda/artiq-doc.yaml
View File

@ -2,10 +2,10 @@
# $ conda env create -f conda/artiq-doc.yaml # $ conda env create -f conda/artiq-doc.yaml
name: artiq-doc name: artiq-doc
channels: channels:
- defaults
- conda-forge/label/main
- m-labs/label/dev - m-labs/label/dev
- m-labs/label/main - m-labs/label/main
- defaults
- conda-forge/label/main
dependencies: dependencies:
- python>=3.5.3,<3.6 - python>=3.5.3,<3.6
- sphinx=1.4.8 - sphinx=1.4.8

6
doc/manual/installing.rst
View File

@ -37,18 +37,18 @@ Installing the ARTIQ packages
First add the conda-forge repository containing ARTIQ dependencies 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 $ conda config --prepend channels http://conda.anaconda.org/conda-forge/label/main
Then add the M-Labs ``main`` Anaconda package repository containing stable releases and release candidates:: 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 --prepend channels http://conda.anaconda.org/m-labs/label/main
.. note:: .. note::
To use the development versions of ARTIQ, also add the ``dev`` label (http://conda.anaconda.org/m-labs/label/dev). To use the development versions of ARTIQ, also add the ``dev`` label (http://conda.anaconda.org/m-labs/label/dev).
Development versions are built for every change and contain more features, but are not as well-tested and are more likely to contain more bugs or inconsistencies than the releases in the ``main`` label. Development versions are built for every change and contain more features, but are not as well-tested and are more likely to contain more bugs or inconsistencies than the releases in the ``main`` label.
Then prepare to create a new conda environment with the ARTIQ package and the matching binaries for your hardware: Then prepare to create a new conda environment with the ARTIQ package and the matching binaries for your hardware:
choose a suitable name for the environment, for example ``artiq-main`` if you intend to track the main label or ``artiq-2016-04-01`` if you consider the environment a snapshot of ARTIQ on 2016-04-01. choose a suitable name for the environment, for example ``artiq-main`` if you intend to track the main label, ``artiq-3`` for the 3.x release series, or ``artiq-2016-04-01`` if you consider the environment a snapshot of ARTIQ on 2016-04-01.
Choose the package containing the binaries for your hardware: Choose the package containing the binaries for your hardware:
* ``artiq-kc705-nist_clock`` for the KC705 board with the NIST "clock" FMC backplane and AD9914 DDS chips. * ``artiq-kc705-nist_clock`` for the KC705 board with the NIST "clock" FMC backplane and AD9914 DDS chips.