Skip to content

Commit

Permalink
conda: move everything except artiq to conda-recipes (closes #138).
Browse files Browse the repository at this point in the history
whitequark committed Oct 16, 2015
1 parent cbda753 commit f3e61e2
Showing 57 changed files with 5 additions and 663 deletions.
1 change: 1 addition & 0 deletions .travis/get-anaconda.sh
Original file line number Diff line number Diff line change
@@ -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
17 changes: 0 additions & 17 deletions conda/README.md

This file was deleted.

2 changes: 0 additions & 2 deletions conda/aiohttp/bld.bat

This file was deleted.

3 changes: 0 additions & 3 deletions conda/aiohttp/build.sh

This file was deleted.

36 changes: 0 additions & 36 deletions conda/aiohttp/meta.yaml

This file was deleted.

8 changes: 0 additions & 8 deletions conda/binutils-or1k-linux/README.md

This file was deleted.

10 changes: 0 additions & 10 deletions conda/binutils-or1k-linux/bld.bat

This file was deleted.

6 changes: 0 additions & 6 deletions conda/binutils-or1k-linux/build.sh

This file was deleted.

20 changes: 0 additions & 20 deletions conda/binutils-or1k-linux/meta.yaml

This file was deleted.

2 changes: 0 additions & 2 deletions conda/chardet/bld.bat

This file was deleted.

1 change: 0 additions & 1 deletion conda/chardet/build.sh

This file was deleted.

33 changes: 0 additions & 33 deletions conda/chardet/meta.yaml

This file was deleted.

1 change: 0 additions & 1 deletion conda/dateutil/bld.bat

This file was deleted.

1 change: 0 additions & 1 deletion conda/dateutil/build.sh

This file was deleted.

30 changes: 0 additions & 30 deletions conda/dateutil/meta.yaml

This file was deleted.

5 changes: 0 additions & 5 deletions conda/flterm/build.sh

This file was deleted.

12 changes: 0 additions & 12 deletions conda/flterm/meta.yaml

This file was deleted.

20 changes: 0 additions & 20 deletions conda/libgit2/bld.bat

This file was deleted.

7 changes: 0 additions & 7 deletions conda/libgit2/build.sh

This file was deleted.

27 changes: 0 additions & 27 deletions conda/libgit2/meta.yaml

This file was deleted.

17 changes: 0 additions & 17 deletions conda/libssh2/bld.bat

This file was deleted.

7 changes: 0 additions & 7 deletions conda/libssh2/build.sh

This file was deleted.

23 changes: 0 additions & 23 deletions conda/libssh2/meta.yaml

This file was deleted.

2 changes: 0 additions & 2 deletions conda/lit/bld.bat

This file was deleted.

1 change: 0 additions & 1 deletion conda/lit/build.sh

This file was deleted.

27 changes: 0 additions & 27 deletions conda/lit/meta.yaml

This file was deleted.

25 changes: 0 additions & 25 deletions conda/llvmdev-or1k/bld.bat

This file was deleted.

10 changes: 0 additions & 10 deletions conda/llvmdev-or1k/build.sh

This file was deleted.

22 changes: 0 additions & 22 deletions conda/llvmdev-or1k/meta.yaml

This file was deleted.

8 changes: 0 additions & 8 deletions conda/llvmlite-artiq/bld.bat

This file was deleted.

3 changes: 0 additions & 3 deletions conda/llvmlite-artiq/build.sh

This file was deleted.

27 changes: 0 additions & 27 deletions conda/llvmlite-artiq/meta.yaml

This file was deleted.

8 changes: 0 additions & 8 deletions conda/prettytable/bld.bat

This file was deleted.

3 changes: 0 additions & 3 deletions conda/prettytable/build.sh

This file was deleted.

26 changes: 0 additions & 26 deletions conda/prettytable/meta.yaml

This file was deleted.

2 changes: 0 additions & 2 deletions conda/pydaqmx/bld.bat

This file was deleted.

2 changes: 0 additions & 2 deletions conda/pydaqmx/build.sh

This file was deleted.

22 changes: 0 additions & 22 deletions conda/pydaqmx/meta.yaml

This file was deleted.

1 change: 0 additions & 1 deletion conda/pyelftools/bld.bat

This file was deleted.

1 change: 0 additions & 1 deletion conda/pyelftools/build.sh

This file was deleted.

26 changes: 0 additions & 26 deletions conda/pyelftools/meta.yaml

This file was deleted.

3 changes: 0 additions & 3 deletions conda/pygit2/bld.bat

This file was deleted.

2 changes: 0 additions & 2 deletions conda/pygit2/build.sh

This file was deleted.

28 changes: 0 additions & 28 deletions conda/pygit2/meta.yaml

This file was deleted.

2 changes: 0 additions & 2 deletions conda/pyqtgraph/bld.bat

This file was deleted.

3 changes: 0 additions & 3 deletions conda/pyqtgraph/build.sh

This file was deleted.

27 changes: 0 additions & 27 deletions conda/pyqtgraph/meta.yaml

This file was deleted.

2 changes: 0 additions & 2 deletions conda/pythonparser/bld.bat

This file was deleted.

2 changes: 0 additions & 2 deletions conda/pythonparser/build.sh

This file was deleted.

24 changes: 0 additions & 24 deletions conda/pythonparser/meta.yaml

This file was deleted.

1 change: 0 additions & 1 deletion conda/quamash/bld.bat

This file was deleted.

3 changes: 0 additions & 3 deletions conda/quamash/build.sh

This file was deleted.

29 changes: 0 additions & 29 deletions conda/quamash/meta.yaml

This file was deleted.

1 change: 0 additions & 1 deletion conda/sphinx-argparse/bld.bat

This file was deleted.

1 change: 0 additions & 1 deletion conda/sphinx-argparse/build.sh

This file was deleted.

28 changes: 0 additions & 28 deletions conda/sphinx-argparse/meta.yaml

This file was deleted.

7 changes: 4 additions & 3 deletions doc/manual/installing.rst
Original file line number Diff line number Diff line change
@@ -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::

0 comments on commit f3e61e2

Please sign in to comment.