Merge pull request #2 from abezzub/only-conda

Do not install dependencies with pip
teamupstart · Feb 26, 2015 · 9334002 · 9334002
2 parents dbe3053 + 1533c5e
commit 9334002
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+# Ignore PyCharm stuff
+.idea
diff --git a/bin/steps/conda_compile b/bin/steps/conda_compile
@@ -13,10 +13,5 @@ if [ -f conda-requirements.txt ]; then
     conda install --file conda-requirements.txt --yes | indent
 fi
 
-if [ -f requirements.txt ]; then
-    puts-step "Installing dependencies using Pip"
-    pip install -r requirements.txt  --exists-action=w --allow-all-external | indent
-fi
-
 puts-step "Cleaning up the installation environment."
 conda clean -pt --yes > /dev/null