summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2017-01-17 11:02:44 +0100
committerWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2017-01-17 11:02:44 +0100
commit8dea7f164e246f2d17674e46e15da2697711b882 (patch)
tree44555ead79e723cf5c3af8b8128de6b560cd37b0
parentf2789774ca5c5540c625ad930c06f712c6e0122b (diff)
downloadastra-8dea7f164e246f2d17674e46e15da2697711b882.tar.gz
astra-8dea7f164e246f2d17674e46e15da2697711b882.tar.bz2
astra-8dea7f164e246f2d17674e46e15da2697711b882.tar.xz
astra-8dea7f164e246f2d17674e46e15da2697711b882.zip
Add conda install instructions to README
-rw-r--r--README.md16
-rw-r--r--README.txt12
2 files changed, 28 insertions, 0 deletions
diff --git a/README.md b/README.md
index 20f87ac..73f5424 100644
--- a/README.md
+++ b/README.md
@@ -24,6 +24,22 @@ astra module to your Python site-packages directory. We require the Microsoft
Visual Studio 2015 redistributable package. If this is not already installed on
your system, it is included as vc_redist.x64.exe in the ASTRA zip file.
+### Linux/Windows, using conda for python
+
+Requirements: [conda](http://conda.pydata.org/) python environment, with 64 bit Python 2.7, 3.5 or 3.6.
+
+There are packages available for the ASTRA Toolbox in the astra-toolbox
+channel for the conda package manager. To use these, run the following
+inside a conda environment.
+
+```
+conda install -c astra-toolbox astra-toolbox
+```
+
+Linux, from source
+------------------
+
+
### Linux, from source
#### For Matlab
diff --git a/README.txt b/README.txt
index 0edc236..8de13b2 100644
--- a/README.txt
+++ b/README.txt
@@ -49,6 +49,18 @@ your system, it is included as vc_redist.x64.exe in the ASTRA zip file.
+Linux/Windows, using conda for python
+-------------------------------------
+
+Requirements: `conda <http://conda.pydata.org/>`_ python environment, with 64 bit Python 2.7, 3.5 or 3.6.
+
+There are packages available for the ASTRA Toolbox in the astra-toolbox
+channel for the conda package manager. To use these, run the following
+inside a conda environment.
+
+conda install -c astra-toolbox astra-toolbox
+
+
Linux, from source:
--------------------