Move conda install to a shell script (tdhopper#5)

tdhopper · web-flow · commit 54e692cbaec9 · 2017-06-27T13:22:49.000-04:00
* install conda in makefile

* try to get hash to run

* full conda path

* install travis from bash script
diff --git a/.travis.yml b/.travis.yml
@@ -4,18 +4,9 @@ python:
 notifications:
   email: false
 before_install:
-  - sudo apt-get update
-  - wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
-  - bash miniconda.sh -b -p $HOME/miniconda
-  - rm -f miniconda.sh
   - export PATH="$HOME/miniconda/bin:$PATH"
-  - hash -r
-  - conda config --set always_yes yes --set changeps1 no
-  - conda update -q conda
-  # Useful for debugging any issues with conda
-  - conda info -a
-  - conda install r-essentials pip
-  - conda install -c r rpy2
+  - sudo apt-get update
+  - bash .travis/install_conda.sh
   - Rscript .travis/setup.R
 install: "pip install -r requirements.txt"
 script: make travis
diff --git a/.travis/install_conda.sh b/.travis/install_conda.sh
@@ -0,0 +1,9 @@
+wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
+bash miniconda.sh -b -p $HOME/miniconda
+rm -f miniconda.sh
+hash -r
+$HOME/miniconda/bin/conda config --set always_yes yes --set changeps1 no
+$HOME/miniconda/bin/conda update -q conda
+$HOME/miniconda/bin/conda info -a
+$HOME/miniconda/bin/conda install r-essentials pip
+$HOME/miniconda/bin/conda install -c r rpy2
diff --git a/Makefile b/Makefile
@@ -33,4 +33,4 @@ dev_environment:
 cloudfront_invalidate:
 	python .travis/invalidate_cloudfront.py
 
-.PHONY: all render s3_upload run_nb travis clean invalidate_cache cloudfront_invalidate
+.PHONY: all render s3_upload run_nb travis clean cloudfront_invalidate
