Skip to content
This repository has been archived by the owner on Nov 13, 2020. It is now read-only.

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Kevin Michel committed Jan 13, 2017
2 parents 077c351 + 87945f3 commit aee296f
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 4 deletions.
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@ Conda Buildpack

This is a [Heroku Buildpack](https://devcenter.heroku.com/articles/buildpacks) for [Conda](http://conda.pydata.org/), the Python distribution for scientific computing by Continuum Analytics.

-----------------------

**Note:** Heroku now recommends using their beta Docker support to achieve [similar results](https://github.com/heroku-examples/python-miniconda).

-----------------------

This buildpack enables the installation of binary packages through the
open source [conda](http://conda.pydata.org/) application. Conda is
recognized as being core to Continuum's Anaconda Scientific Python distro
Expand Down
12 changes: 8 additions & 4 deletions bin/steps/conda_compile
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
if [ ! -d /app/.heroku/miniconda ]; then
puts-step "Preparing Python/Miniconda Environment (3.5.2)"
curl -Os http://repo.continuum.io/miniconda/Miniconda-3.7.3-Linux-x86_64.sh
bash Miniconda-3.7.3-Linux-x86_64.sh -p /app/.heroku/miniconda/ -b | indent
rm -fr Miniconda-3.7.3-Linux-x86_64.sh
puts-step "Preparing Python/Miniconda Environment"
curl -Os https://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh
bash Miniconda-latest-Linux-x86_64.sh -p /app/.heroku/miniconda/ -b | indent
rm -fr Miniconda-latest-Linux-x86_64.sh

conda install pip --yes | indent
fi

echo "nomkl" > $HOME/.heroku/miniconda/conda-meta/pinned
echo "added pinned file in $HOME/.heroku/miniconda/conda-meta/pinned"
conda install nomkl


if [ -f conda-requirements.txt ]; then
puts-step "Installing dependencies using Conda"
Expand Down

0 comments on commit aee296f

Please sign in to comment.