From 5a947f11595491a027d3e5f6c44dbc23ab9720d0 Mon Sep 17 00:00:00 2001 From: Nicolas Raynaud Date: Thu, 31 Mar 2016 18:24:29 +0200 Subject: [PATCH 1/9] try to add support for heroku environment variables --- bin/compile | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/bin/compile b/bin/compile index baf25e5..084028f 100755 --- a/bin/compile +++ b/bin/compile @@ -16,6 +16,17 @@ BIN_DIR=$(cd $(dirname $0); pwd) # absolute path ROOT_DIR=$(dirname $BIN_DIR) BUILD_DIR=$1 CACHE_DIR=$2 +ENV_DIR=$3 + + +if [ -d "$ENV_DIR" ]; then + for e in $(ls $ENV_DIR); do + echo "$e" | grep -E "$WHITELIST" | grep -qvE "$BLACKLIST" && + export "$e=$(cat $ENV_DIR/$e)" + : + done +fi + CACHED_DIRS=".heroku" From 87871939a16d2d10ac810dbf0244354a0e60970a Mon Sep 17 00:00:00 2001 From: Nicolas Raynaud Date: Thu, 31 Mar 2016 18:30:15 +0200 Subject: [PATCH 2/9] try to add support for heroku environment variables --- bin/compile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/bin/compile b/bin/compile index 084028f..073c9fb 100755 --- a/bin/compile +++ b/bin/compile @@ -20,10 +20,13 @@ ENV_DIR=$3 if [ -d "$ENV_DIR" ]; then + echo "restoring environment" + WHITELIST=${2:-''} + BLACKLIST=${3:-'^(GIT_DIR|PYTHONHOME|LD_LIBRARY_PATH|LIBRARY_PATH|PATH)$'} for e in $(ls $ENV_DIR); do - echo "$e" | grep -E "$WHITELIST" | grep -qvE "$BLACKLIST" && - export "$e=$(cat $ENV_DIR/$e)" - : + echo "$e" | grep -E "$WHITELIST" | grep -qvE "$BLACKLIST" && + export "$e=$(cat $ENV_DIR/$e)" + : done fi From eb8fe15034647273e4f7864e497908626eece1d0 Mon Sep 17 00:00:00 2001 From: Nicolas Raynaud Date: Thu, 31 Mar 2016 18:31:47 +0200 Subject: [PATCH 3/9] try to add support for heroku environment variables --- bin/compile | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/compile b/bin/compile index 073c9fb..8c27968 100755 --- a/bin/compile +++ b/bin/compile @@ -24,6 +24,7 @@ if [ -d "$ENV_DIR" ]; then WHITELIST=${2:-''} BLACKLIST=${3:-'^(GIT_DIR|PYTHONHOME|LD_LIBRARY_PATH|LIBRARY_PATH|PATH)$'} for e in $(ls $ENV_DIR); do + echo "$e" echo "$e" | grep -E "$WHITELIST" | grep -qvE "$BLACKLIST" && export "$e=$(cat $ENV_DIR/$e)" : From eb6d7c868125762feb21ee080f0667ed66658c53 Mon Sep 17 00:00:00 2001 From: Nicolas Raynaud Date: Thu, 31 Mar 2016 18:38:33 +0200 Subject: [PATCH 4/9] try to add support for heroku environment variables --- bin/compile | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/compile b/bin/compile index 8c27968..59ce8a2 100755 --- a/bin/compile +++ b/bin/compile @@ -31,6 +31,7 @@ if [ -d "$ENV_DIR" ]; then done fi +echo "$FTP_USER" CACHED_DIRS=".heroku" From a76398468eadea909ff79d2c76ee4dae2ec0c5e0 Mon Sep 17 00:00:00 2001 From: Nicolas Raynaud Date: Thu, 31 Mar 2016 18:40:30 +0200 Subject: [PATCH 5/9] try to add support for heroku environment variables --- bin/compile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/bin/compile b/bin/compile index 59ce8a2..93863cf 100755 --- a/bin/compile +++ b/bin/compile @@ -25,9 +25,7 @@ if [ -d "$ENV_DIR" ]; then BLACKLIST=${3:-'^(GIT_DIR|PYTHONHOME|LD_LIBRARY_PATH|LIBRARY_PATH|PATH)$'} for e in $(ls $ENV_DIR); do echo "$e" - echo "$e" | grep -E "$WHITELIST" | grep -qvE "$BLACKLIST" && - export "$e=$(cat $ENV_DIR/$e)" - : + export "$e=$(cat $ENV_DIR/$e) done fi From 649657c12887ff35c647bc220a09ada954946a3c Mon Sep 17 00:00:00 2001 From: Nicolas Raynaud Date: Thu, 31 Mar 2016 18:41:28 +0200 Subject: [PATCH 6/9] try to add support for heroku environment variables --- bin/compile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/compile b/bin/compile index 93863cf..640693c 100755 --- a/bin/compile +++ b/bin/compile @@ -25,7 +25,7 @@ if [ -d "$ENV_DIR" ]; then BLACKLIST=${3:-'^(GIT_DIR|PYTHONHOME|LD_LIBRARY_PATH|LIBRARY_PATH|PATH)$'} for e in $(ls $ENV_DIR); do echo "$e" - export "$e=$(cat $ENV_DIR/$e) + export "$e=$(cat $ENV_DIR/$e)" done fi From 9af01e70ff2a8e5d8ff520af1ae1b487d5241b94 Mon Sep 17 00:00:00 2001 From: Nicolas Raynaud Date: Thu, 31 Mar 2016 18:42:56 +0200 Subject: [PATCH 7/9] try to add support for heroku environment variables - cleanup --- bin/compile | 3 --- 1 file changed, 3 deletions(-) diff --git a/bin/compile b/bin/compile index 640693c..3cbc9da 100755 --- a/bin/compile +++ b/bin/compile @@ -24,13 +24,10 @@ if [ -d "$ENV_DIR" ]; then WHITELIST=${2:-''} BLACKLIST=${3:-'^(GIT_DIR|PYTHONHOME|LD_LIBRARY_PATH|LIBRARY_PATH|PATH)$'} for e in $(ls $ENV_DIR); do - echo "$e" export "$e=$(cat $ENV_DIR/$e)" done fi -echo "$FTP_USER" - CACHED_DIRS=".heroku" # Static configurations for virtualenv caches. From 077c35125c8284527d388750ad360d4422bbe386 Mon Sep 17 00:00:00 2001 From: Nicolas Raynaud Date: Fri, 1 Apr 2016 18:33:15 +0200 Subject: [PATCH 8/9] cleanup after adding heroku environment variables --- bin/compile | 2 -- 1 file changed, 2 deletions(-) diff --git a/bin/compile b/bin/compile index 3cbc9da..042e69e 100755 --- a/bin/compile +++ b/bin/compile @@ -21,8 +21,6 @@ ENV_DIR=$3 if [ -d "$ENV_DIR" ]; then echo "restoring environment" - WHITELIST=${2:-''} - BLACKLIST=${3:-'^(GIT_DIR|PYTHONHOME|LD_LIBRARY_PATH|LIBRARY_PATH|PATH)$'} for e in $(ls $ENV_DIR); do export "$e=$(cat $ENV_DIR/$e)" done From a780b5cccba1a668c2df9ed9e1fafa8c2dbf4b9c Mon Sep 17 00:00:00 2001 From: Kevin Michel Date: Fri, 13 Jan 2017 17:35:12 +0100 Subject: [PATCH 9/9] Update to python 3 --- bin/steps/conda_compile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/steps/conda_compile b/bin/steps/conda_compile index 3c9e168..e2abbdd 100755 --- a/bin/steps/conda_compile +++ b/bin/steps/conda_compile @@ -1,8 +1,8 @@ if [ ! -d /app/.heroku/miniconda ]; then 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 + curl -Os https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh + bash Miniconda3-latest-Linux-x86_64.sh -p /app/.heroku/miniconda/ -b | indent + rm -fr Miniconda3-latest-Linux-x86_64.sh conda install pip --yes | indent fi