conda: move everything except artiq to conda-recipes (closes #138).

m-labs · Oct 16, 2015 · f3e61e2 · f3e61e2
1 parent cbda753
commit f3e61e2
Showing 57 changed files with 5 additions and 663 deletions.
diff --git a/.travis/get-anaconda.sh b/.travis/get-anaconda.sh
@@ -10,4 +10,5 @@ conda update -q conda
 conda info -a
 conda install conda-build jinja2
 conda create -q -n py35 python=$TRAVIS_PYTHON_VERSION
+conda config --add channels https://conda.anaconda.org/m-labs/channel/main
 conda config --add channels https://conda.anaconda.org/m-labs/channel/dev
diff --git a/conda/README.md b/conda/README.md
diff --git a/conda/aiohttp/bld.bat b/conda/aiohttp/bld.bat
diff --git a/conda/aiohttp/build.sh b/conda/aiohttp/build.sh
diff --git a/conda/aiohttp/meta.yaml b/conda/aiohttp/meta.yaml
diff --git a/conda/binutils-or1k-linux/README.md b/conda/binutils-or1k-linux/README.md
diff --git a/conda/binutils-or1k-linux/bld.bat b/conda/binutils-or1k-linux/bld.bat
diff --git a/conda/binutils-or1k-linux/build.sh b/conda/binutils-or1k-linux/build.sh
diff --git a/conda/binutils-or1k-linux/meta.yaml b/conda/binutils-or1k-linux/meta.yaml
diff --git a/conda/chardet/bld.bat b/conda/chardet/bld.bat
diff --git a/conda/chardet/build.sh b/conda/chardet/build.sh
diff --git a/conda/chardet/meta.yaml b/conda/chardet/meta.yaml
diff --git a/conda/dateutil/bld.bat b/conda/dateutil/bld.bat
diff --git a/conda/dateutil/build.sh b/conda/dateutil/build.sh
diff --git a/conda/dateutil/meta.yaml b/conda/dateutil/meta.yaml
diff --git a/conda/flterm/build.sh b/conda/flterm/build.sh
diff --git a/conda/flterm/meta.yaml b/conda/flterm/meta.yaml
diff --git a/conda/libgit2/bld.bat b/conda/libgit2/bld.bat
diff --git a/conda/libgit2/build.sh b/conda/libgit2/build.sh
diff --git a/conda/libgit2/meta.yaml b/conda/libgit2/meta.yaml
diff --git a/conda/libssh2/bld.bat b/conda/libssh2/bld.bat
diff --git a/conda/libssh2/build.sh b/conda/libssh2/build.sh
diff --git a/conda/libssh2/meta.yaml b/conda/libssh2/meta.yaml
diff --git a/conda/lit/bld.bat b/conda/lit/bld.bat
diff --git a/conda/lit/build.sh b/conda/lit/build.sh
diff --git a/conda/lit/meta.yaml b/conda/lit/meta.yaml
diff --git a/conda/llvmdev-or1k/bld.bat b/conda/llvmdev-or1k/bld.bat
diff --git a/conda/llvmdev-or1k/build.sh b/conda/llvmdev-or1k/build.sh
diff --git a/conda/llvmdev-or1k/meta.yaml b/conda/llvmdev-or1k/meta.yaml
diff --git a/conda/llvmlite-artiq/bld.bat b/conda/llvmlite-artiq/bld.bat
diff --git a/conda/llvmlite-artiq/build.sh b/conda/llvmlite-artiq/build.sh
diff --git a/conda/llvmlite-artiq/meta.yaml b/conda/llvmlite-artiq/meta.yaml
diff --git a/conda/prettytable/bld.bat b/conda/prettytable/bld.bat
diff --git a/conda/prettytable/build.sh b/conda/prettytable/build.sh
diff --git a/conda/prettytable/meta.yaml b/conda/prettytable/meta.yaml
diff --git a/conda/pydaqmx/bld.bat b/conda/pydaqmx/bld.bat
diff --git a/conda/pydaqmx/build.sh b/conda/pydaqmx/build.sh
diff --git a/conda/pydaqmx/meta.yaml b/conda/pydaqmx/meta.yaml
diff --git a/conda/pyelftools/bld.bat b/conda/pyelftools/bld.bat
diff --git a/conda/pyelftools/build.sh b/conda/pyelftools/build.sh
diff --git a/conda/pyelftools/meta.yaml b/conda/pyelftools/meta.yaml
diff --git a/conda/pygit2/bld.bat b/conda/pygit2/bld.bat
diff --git a/conda/pygit2/build.sh b/conda/pygit2/build.sh
diff --git a/conda/pygit2/meta.yaml b/conda/pygit2/meta.yaml
diff --git a/conda/pyqtgraph/bld.bat b/conda/pyqtgraph/bld.bat
diff --git a/conda/pyqtgraph/build.sh b/conda/pyqtgraph/build.sh
diff --git a/conda/pyqtgraph/meta.yaml b/conda/pyqtgraph/meta.yaml
diff --git a/conda/pythonparser/bld.bat b/conda/pythonparser/bld.bat
diff --git a/conda/pythonparser/build.sh b/conda/pythonparser/build.sh
diff --git a/conda/pythonparser/meta.yaml b/conda/pythonparser/meta.yaml
diff --git a/conda/quamash/bld.bat b/conda/quamash/bld.bat
diff --git a/conda/quamash/build.sh b/conda/quamash/build.sh
diff --git a/conda/quamash/meta.yaml b/conda/quamash/meta.yaml
diff --git a/conda/sphinx-argparse/bld.bat b/conda/sphinx-argparse/bld.bat
diff --git a/conda/sphinx-argparse/build.sh b/conda/sphinx-argparse/build.sh
diff --git a/conda/sphinx-argparse/meta.yaml b/conda/sphinx-argparse/meta.yaml
diff --git a/doc/manual/installing.rst b/doc/manual/installing.rst
@@ -13,12 +13,12 @@ Installing using conda
 Installing Anaconda or Miniconda
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-* You can either install Anaconda (chose Python 3.5) from https://store.continuum.io/cshop/anaconda/
+* You can either install Anaconda (choose Python 3.5) from https://store.continuum.io/cshop/anaconda/
 
-* Or install the more minimalistic Miniconda (chose 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, chose the Windows 32-bit version regardless of whether you have
+    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::
@@ -40,6 +40,7 @@ Installing the host side software
 
 For this, you need to add our binstar repository to your conda configuration::
 
+    $ conda config --add channels http://conda.anaconda.org/m-labs/channel/main
     $ conda config --add channels http://conda.anaconda.org/m-labs/channel/dev
 
 Then you can install the ARTIQ package, it will pull all the necessary dependencies::