M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

manual/installing: refresh

This commit is contained in:
Sebastien Bourdeauducq 2016-02-10 23:37:21 +01:00
parent 64263b75d0
commit b68035d162
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
doc/manual/installing.rst
View File

@ -14,6 +14,11 @@ But you can also :ref:`install from sources <install-from-sources>`.
Installing using conda Installing using conda
---------------------- ----------------------
.. warning::
Conda packages are supported for Linux (64-bit) and Windows (32- and 64-bit). Users of other
operating systems (32-bit Linux, BSD, ...) should install from source.
Installing Anaconda or Miniconda Installing Anaconda or Miniconda
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -21,10 +26,6 @@ Installing Anaconda or Miniconda
* Or install the more minimalistic Miniconda (choose Python 3.5) from http://conda.pydata.org/miniconda.html * Or install the more minimalistic Miniconda (choose Python 3.5) from http://conda.pydata.org/miniconda.html
.. warning::
If you are installing on Windows, choose the Windows 32-bit version regardless of whether you have
a 32-bit or 64-bit Windows.
After installing either Anaconda or Miniconda, open a new terminal and make sure the following command works:: After installing either Anaconda or Miniconda, open a new terminal and make sure the following command works::
$ conda $ conda