Commit 8ffa4143 authored by Casey Faist's avatar Casey Faist

Merge branch 'master' into dont-upgrade-pipenv

parents e306653d 63e84ace
# Python Buildpack Changelog # Python Buildpack Changelog
# 140 (2018-10-X) # 140 (2018-10-09)
Add an `OVERRIDDEN_PIPENV_VERSION` option to override the version of Pipenv Add support for detecting SLUGIFY_USES_TEXT_UNIDECODE, which is required to
used in the buildpack install Apache Airflow version 1.10 or higher.
Upgrade the `DEFAULT_PIPENV_VERSION` to `2018.7.1`
# 139 (2018-10-08)
# 139 (2018-10-8)
Improvements to Python install messaging Improvements to Python install messaging
......
...@@ -8,10 +8,24 @@ if [ ! "$SKIP_PIP_INSTALL" ]; then ...@@ -8,10 +8,24 @@ if [ ! "$SKIP_PIP_INSTALL" ]; then
# Install dependencies with Pip. # Install dependencies with Pip.
puts-step "Installing requirements with pip" puts-step "Installing requirements with pip"
# Set PIP_EXTRA_INDEX_URL # Set Pip env vars
# This reads certain environment variables set on the Heroku app config
# and makes them accessible to the pip install process.
#
# PIP_EXTRA_INDEX_URL allows for an alternate pypi URL to be used.
if [[ -r $ENV_DIR/PIP_EXTRA_INDEX_URL ]]; then if [[ -r $ENV_DIR/PIP_EXTRA_INDEX_URL ]]; then
PIP_EXTRA_INDEX_URL="$(cat "$ENV_DIR/PIP_EXTRA_INDEX_URL")" PIP_EXTRA_INDEX_URL="$(cat "$ENV_DIR/PIP_EXTRA_INDEX_URL")"
export PIP_EXTRA_INDEX_URL export PIP_EXTRA_INDEX_URL
mcount "buildvar.PIP_EXTRA_INDEX_URL"
fi
set +e
# Set SLUGIFY_USES_TEXT_UNIDECODE, required for Airflow versions >=1.10
if [[ -r $ENV_DIR/SLUGIFY_USES_TEXT_UNIDECODE ]]; then
SLUGIFY_USES_TEXT_UNIDECODE="$(cat "$ENV_DIR/SLUGIFY_USES_TEXT_UNIDECODE")"
export SLUGIFY_USES_TEXT_UNIDECODE
mcount "buildvar.SLUGIFY_USES_TEXT_UNIDECODE"
fi fi
set +e set +e
......
...@@ -30,10 +30,22 @@ if [ ! "$SKIP_PIPENV_INSTALL" ]; then ...@@ -30,10 +30,22 @@ if [ ! "$SKIP_PIPENV_INSTALL" ]; then
# Skip pip install, later. # Skip pip install, later.
export SKIP_PIP_INSTALL=1 export SKIP_PIP_INSTALL=1
# Set PIP_EXTRA_INDEX_URL # Set Pip env vars
# This reads certain environment variables set on the Heroku app config
# and makes them accessible to the pip install process.
#
# PIP_EXTRA_INDEX_URL allows for an alternate pypi URL to be used.
if [[ -r $ENV_DIR/PIP_EXTRA_INDEX_URL ]]; then if [[ -r $ENV_DIR/PIP_EXTRA_INDEX_URL ]]; then
PIP_EXTRA_INDEX_URL="$(cat "$ENV_DIR/PIP_EXTRA_INDEX_URL")" PIP_EXTRA_INDEX_URL="$(cat "$ENV_DIR/PIP_EXTRA_INDEX_URL")"
export PIP_EXTRA_INDEX_URL export PIP_EXTRA_INDEX_URL
mcount "buildvar.PIP_EXTRA_INDEX_URL"
fi
# Set SLUGIFY_USES_TEXT_UNIDECODE, required for Airflow versions >=1.10
if [[ -r $ENV_DIR/SLUGIFY_USES_TEXT_UNIDECODE ]]; then
SLUGIFY_USES_TEXT_UNIDECODE="$(cat "$ENV_DIR/SLUGIFY_USES_TEXT_UNIDECODE")"
export SLUGIFY_USES_TEXT_UNIDECODE
mcount "buildvar.SLUGIFY_USES_TEXT_UNIDECODE"
fi fi
export DEFAULT_PIPENV_VERSION="2018.7.1" export DEFAULT_PIPENV_VERSION="2018.7.1"
......
#!/usr/bin/env bash #!/usr/bin/env bash
testAirflow() {
export SLUGIFY_USES_TEXT_UNIDECODE="yes"
compile "airflow"
assertCaptured "apache-airflow==1.10"
assertCapturedSuccess
}
testPipenv() { testPipenv() {
compile "pipenv" compile "pipenv"
assertCapturedSuccess assertCapturedSuccess
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment