Poetry Feature

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "python.linting.pylintEnabled": false
+}

bin/compile

@@ -205,12 +205,19 @@ fi
 export CACHED_PYTHON_STACK
 
 # Pipenv Python version support.
-# Detect the version of Python requested from a Pipfile (e.g. python_version or python_full_version).
+# Detect the version of Python requested from a Pipfile or Pipfile.lock file.
 # Convert it to a runtime.txt file.
 
 # shellcheck source=bin/steps/pipenv-python-version
 source "$BIN_DIR/steps/pipenv-python-version"
 
+# Poetry Python version support.
+# Detect the version of Python requested from a pyproject.toml or poetry.lock file.
+# Convert it to a runtime.txt file.
+
+# shellcheck source=bin/steps/poetry-python-version
+source "$BIN_DIR/steps/poetry-python-version"
+
 # If no runtime was provided by the user, assume the default Python runtime version.
 if [ ! -f runtime.txt ]; then
   echo "$DEFAULT_PYTHON_VERSION" > runtime.txt
@@ -240,10 +247,14 @@ fi
 source "$BIN_DIR/steps/python"
 mtime "python.install.time" "${start}"
 
-# Install Pipenv dependencies, if a Pipfile was provided.
+# Install Pipenv dependencies if Pipenv managed project.
 # shellcheck source=bin/steps/pipenv
 source "$BIN_DIR/steps/pipenv"
 
+# Install Poetry dependencies if Poetry managed project.
+# shellcheck source=bin/steps/poetry
+source "$BIN_DIR/steps/poetry"
+
 # Uninstall removed dependencies with Pip.
 # The buildpack will automatically remove any declared dependencies (in requirements.txt)
 # that were explicitly removed. This machinery is a bit complex, but it is not complicated.
@@ -256,7 +267,7 @@ mtime "pip.uninstall.time" "${start}"
 # This allows for people to ship a setup.py application to Heroku
 # (which is rare, but I vouch that it should work!)
 
-if [ ! -f requirements.txt ] && [ ! -f Pipfile ]; then
+if [ ! -f requirements.txt ] && [ ! -f Pipfile ] && [ ! -f Pipfile.lock ] && [ ! -f pyproject.toml ] && [ ! -f poetry.lock ]; then
   echo "-e ." > requirements.txt
 fi
 

bin/detect

@@ -15,8 +15,8 @@
 BUILD_DIR=$1
 
 # Exit early if app is clearly not Python.
-if [ ! -f "$BUILD_DIR/requirements.txt" ] && [ ! -f "$BUILD_DIR/setup.py" ] && [ ! -f "$BUILD_DIR/Pipfile" ]; then
+if [ -f "$BUILD_DIR/requirements.txt" ] || [ -f "$BUILD_DIR/setup.py" ] || [ -f "$BUILD_DIR/Pipfile" ] || [ -f "$BUILD_DIR/Pipfile.lock"] || [ -f "$BUILD_DIR/pyproject.py"] || [ -f "$BUILD_DIR/poetry.lock"]; then
+  echo Python Project Detected...
+else
   exit 1
-fi
-
-echo Python
+fi

bin/steps/pipenv

@@ -6,81 +6,70 @@
 source "$BIN_DIR/utils"
 set -e
 
-if [[ -f Pipfile.lock ]]; then
-    if [[ -f .heroku/python/Pipfile.lock.sha256 ]]; then
-        if [[ $(openssl dgst -sha256 Pipfile.lock) == $(cat .heroku/python/Pipfile.lock.sha256) ]]; then
-            # Measure that we're using Pipenv.
-            mcount "tool.pipenv"
+if [[ -f Pipfile || -f Pipfile.lock ]]; then
+    mcount "tool.pipenv"
 
-            # Don't skip installation of there are git deps.
-            if ! grep -q 'git' Pipfile.lock; then
-                echo "Skipping installation, as Pipfile.lock hasn't changed since last deploy." | indent
-
-                mcount "tool.pipenv"
-                export SKIP_PIPENV_INSTALL=1
-                export SKIP_PIP_INSTALL=1
-            fi
-        fi
+    # 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
+        PIP_EXTRA_INDEX_URL="$(cat "$ENV_DIR/PIP_EXTRA_INDEX_URL")"
+        export PIP_EXTRA_INDEX_URL
+        mcount "buildvar.PIP_EXTRA_INDEX_URL"
     fi
-fi
-
 
-if [ ! "$SKIP_PIPENV_INSTALL" ]; then
-    # Pipenv support (Generate requriements.txt with pipenv).
-    if [[ -f Pipfile ]]; then
-        # Measure that we're using Pipenv.
-        mcount "tool.pipenv"
+    # 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
 
-        # Skip pip install, later.
-        export SKIP_PIP_INSTALL=1
+    # Set PIPEN_VERSION implicitly
+    if [[ -r "$ENV_DIR/PIPENV_VERSION" ]]; then
+        PIPENV_VERSION="$(cat "$ENV_DIR/PIPENV_VERSION")"
+        export PIPENV_VERSION
+        mcount "buildvar.PIPENV_VERSION"
+    else
+        export PIPENV_VERSION="2018.5.18"
+    fi
 
-        # 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
-            PIP_EXTRA_INDEX_URL="$(cat "$ENV_DIR/PIP_EXTRA_INDEX_URL")"
-            export PIP_EXTRA_INDEX_URL
-            mcount "buildvar.PIP_EXTRA_INDEX_URL"
-        fi
+    # Install pipenv.
+    # Due to weird old pip behavior and pipenv behavior, pipenv upgrades pip
+    # to latest if only --upgrade is specified. Specify upgrade strategy to
+    # avoid this eager behavior.
+    /app/.heroku/python/bin/pip install pipenv==$PIPENV_VERSION --upgrade --upgrade-strategy only-if-needed &> /dev/null
 
-        # 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
+    # Install the dependencies.
+    if [[ ! -f Pipfile.lock ]]; then
+
+        /app/.heroku/python/bin/pipenv lock 2>&1 | cleanup | indent
 
-        export PIPENV_VERSION="2018.5.18"
-
-        # Install pipenv.
-        # Due to weird old pip behavior and pipenv behavior, pipenv upgrades pip
-        # to latest if only --upgrade is specified. Specify upgrade strategy to
-        # avoid this eager behavior.
-        /app/.heroku/python/bin/pip install pipenv==$PIPENV_VERSION --upgrade --upgrade-strategy only-if-needed &> /dev/null
+    fi
 
-        # Install the dependencies.
+    # Install the dependencies.
         if [[ ! -f Pipfile.lock ]]; then
-            puts-step "Installing dependencies with Pipenv $PIPENV_VERSION…"
-            /app/.heroku/python/bin/pipenv install --system --skip-lock 2>&1 | indent
+            if [ "$INSTALL_TEST" ]; then
+                puts-step "Installing default and development dependencies with Pipenv (Pipfile) $PIPENV_VERSION…"
+                /app/.heroku/python/bin/pipenv install --system --skip-lock --dev 2>&1 | cleanup | indent
+            else
+                puts-step "Installing default dependencies with Pipenv (Pipfile) $PIPENV_VERSION…"
+                /app/.heroku/python/bin/pipenv install --system --skip-lock 2>&1 | cleanup | indent
+            fi
         else
-            pipenv-to-pip Pipfile.lock > requirements.txt
-            "$BIN_DIR/steps/pip-uninstall"
-            cp requirements.txt .heroku/python/requirements-declared.txt
-            openssl dgst -sha256 Pipfile.lock > .heroku/python/Pipfile.lock.sha256
-
-            puts-step "Installing dependencies with Pipenv $PIPENV_VERSION…"
-            /app/.heroku/python/bin/pipenv install --system --deploy 2>&1 | indent
-        fi
-
-        # Install the test dependencies, for CI.
-        if [ "$INSTALL_TEST" ]; then
-            puts-step "Installing test dependencies…"
-            /app/.heroku/python/bin/pipenv install --dev --system --deploy 2>&1 | cleanup | indent
+            if [ "$INSTALL_TEST" ]; then
+                puts-step "Installing default and development dependencies with Pipenv (Pipfile.lock) $PIPENV_VERSION…"
+                /app/.heroku/python/bin/pipenv install --system --deploy --dev 2>&1 | cleanup | indent
+            else
+                puts-step "Installing default dependencies with Pipenv (Pipfile.lock) $PIPENV_VERSION…"
+                /app/.heroku/python/bin/pipenv install --system --deploy 2>&1 | cleanup | indent
+            fi
         fi
-    fi
-else
+
+    # Skip pip install later on.
     export SKIP_PIP_INSTALL=1
-    pipenv-to-pip Pipfile.lock > requirements.txt
+
 fi
+set +e
+

bin/steps/pipenv-python-version

@@ -1,35 +1,60 @@
 #!/usr/bin/env bash
-
-# Detect Python-version with Pipenv.
-
-if [[ -f $BUILD_DIR/Pipfile ]]; then
+if [[ -f $BUILD_DIR/Pipfile || -f $BUILD_DIR/Pipfile.lock ]]; then
 
     if [[ ! -f $BUILD_DIR/runtime.txt ]]; then
         if [[ ! -f $BUILD_DIR/Pipfile.lock ]]; then
             puts-warn "No 'Pipfile.lock' found! We recommend you commit this into your repository."
-        fi
-        if [[ -f $BUILD_DIR/Pipfile.lock ]]; then
             set +e
-            PYTHON=$(jq -r '._meta.requires.python_full_version' "$BUILD_DIR/Pipfile.lock")
-            if [[ "$PYTHON" != "null" ]]; then
+            PYTHON=$(sed -nr "/^\[requires\]/ { :l /^python_full_version[ ]*=/ { s/.*=[ ]*//; p; q;}; n; b l;}" "$BUILD_DIR/Pipfile" | tr -d '"')
+            if ! [ -z "$PYTHON"]; then
                 echo "python-$PYTHON" > "$BUILD_DIR/runtime.txt"
+            else
+                PYTHON=$(sed -nr "/^\[requires\]/ { :l /^python_version[ ]*=/ { s/.*=[ ]*//; p; q;}; n; b l;}" "$BUILD_DIR/Pipfile" | tr -d '"')
+                if ! [ -z "$PYTHON"]; then
+                    if [ "$PYTHON" = 2.7 ]; then
+                        echo "$LATEST_27" > "$BUILD_DIR/runtime.txt"
+                    fi
+                    if [ "$PYTHON" = 3.4 ]; then
+                        echo "$LATEST_34" > "$BUILD_DIR/runtime.txt"
+                    fi
+                    if [ "$PYTHON" = 3.5 ]; then
+                        echo "$LATEST_35" > "$BUILD_DIR/runtime.txt"
+                    fi
+                    if [ "$PYTHON" = 3.6 ]; then
+                        echo "$LATEST_36" > "$BUILD_DIR/runtime.txt"
+                    fi
+                    if [ "$PYTHON" = 3.7 ]; then
+                        echo "$LATEST_37" > "$BUILD_DIR/runtime.txt"
+                    fi
+                fi
             fi
             set -e
-
-            if [[ "$PYTHON" == "null" ]]; then
+        else
+            set +e
+            PYTHON=$(jq -r '._meta.requires.python_full_version' "$BUILD_DIR/Pipfile.lock")
+            if [[ "$PYTHON" != "null" ]]; then
+                echo "python-$PYTHON" > "$BUILD_DIR/runtime.txt"
+            else
                 PYTHON=$(jq -r '._meta.requires.python_version' "$BUILD_DIR/Pipfile.lock")
-                if [ "$PYTHON" = 2.7 ]; then
-                    echo "$LATEST_27" > "$BUILD_DIR/runtime.txt"
-                fi
-                if [ "$PYTHON" = 3.6 ]; then
-                    echo "$LATEST_36" > "$BUILD_DIR/runtime.txt"
-                fi
-                if [ "$PYTHON" = 3.7 ]; then
-                    echo "$LATEST_37" > "$BUILD_DIR/runtime.txt"
+                if [[ "$PYTHON" != "null" ]]; then
+                    if [ "$PYTHON" = 2.7 ]; then
+                        echo "$LATEST_27" > "$BUILD_DIR/runtime.txt"
+                    fi
+                    if [ "$PYTHON" = 3.4 ]; then
+                        echo "$LATEST_34" > "$BUILD_DIR/runtime.txt"
+                    fi
+                    if [ "$PYTHON" = 3.5 ]; then
+                        echo "$LATEST_35" > "$BUILD_DIR/runtime.txt"
+                    fi
+                    if [ "$PYTHON" = 3.6 ]; then
+                        echo "$LATEST_36" > "$BUILD_DIR/runtime.txt"
+                    fi
+                    if [ "$PYTHON" = 3.7 ]; then
+                        echo "$LATEST_37" > "$BUILD_DIR/runtime.txt"
+                    fi
                 fi
             fi
-
-
+            set -e
         fi
     fi
 fi

bin/steps/poetry

@@ -0,0 +1,55 @@
+#!/usr/bin/env bash
+
+# shellcheck source=bin/utils
+source "$BIN_DIR/utils"
+set -e
+
+if [[ -f pyproject.toml || -f poetry.lock ]]; then
+    mcount "tool.poetry"
+
+    # Set Pip env varsz
+    # 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
+        PIP_EXTRA_INDEX_URL="$(cat "$ENV_DIR/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
+
+    # # Get Poetry Version from file
+    if [[ -r "$ENV_DIR/POETRY_VERSION" ]]; then
+        POETRY_VERSION="$(cat "$ENV_DIR/POETRY_VERSION")"
+        export POETRY_VERSION
+        mcount "buildvar.POETRY_VERSION"
+    else
+        export POETRY_VERSION="0.12.11"
+    fi
+
+    # Install poetry.
+    /app/.heroku/python/bin/pip install poetry==$POETRY_VERSION 2>&1 | cleanup | indent
+
+    # Install the dependencies.
+    if [ "$INSTALL_TEST" ]; then
+        puts-step "Installing default and development dependencies with Poetry $POETRY_VERSION…"
+        /app/.heroku/python/bin/poetry install 2>&1 | cleanup | indent
+    else
+        puts-step "Installing default dependencies with Poetry $POETRY_VERSION…"
+        /app/.heroku/python/bin/poetry install --no-dev 2>&1 | cleanup | indent
+    fi
+
+    /app/.heroku/python/bin/poetry run pip freeze > requirements.txt
+
+    # Skip pip install later on.
+    export SKIP_PIP_INSTALL=1
+
+fi
+set +e
+

bin/steps/poetry-python-version

@@ -0,0 +1,49 @@
+#!/usr/bin/env bash            
+
+set +e
+if [[ -f $BUILD_DIR/pyproject.toml || -f $BUILD_DIR/poetry.lock ]]; then
+
+    if [[ ! -f $BUILD_DIR/runtime.txt ]]; then
+
+        if [[ ! -f $BUILD_DIR/poetry.lock ]]; then
+
+            puts-warn "No 'poetry.lock' found! We recommend you commit this into your repository."
+            PYTHON=$(sed -nr "/^\[tool.poetry.dependencies\]/ { :l /^python[ ]*=/ { s/.*=[ ]*//; p; q;}; n; b l;}" "$BUILD_DIR/pyproject.toml" | tr -d '"^')
+            echo $PYTHON
+            if ! [ -z $PYTHON]; then
+                if [[ "$PYTHON" == +([0-9]).+([0-9]).+([0-9]) ]]; then
+                    echo "python-$PYTHON" > "$BUILD_DIR/runtime.txt"
+                elif [ $PYTHON = 2.7 ]; then
+                    echo "$LATEST_27" > "$BUILD_DIR/runtime.txt"
+                elif [ "$PYTHON" = 3.4 ]; then
+                    echo "$LATEST_34" > "$BUILD_DIR/runtime.txt"
+                elif [ "$PYTHON" = 3.5 ]; then
+                    echo "$LATEST_35" > "$BUILD_DIR/runtime.txt"
+                elif [ "$PYTHON" = 3.6 ]; then
+                    echo "$LATEST_36" > "$BUILD_DIR/runtime.txt"
+                elif [ "$PYTHON" = 3.7 ]; then
+                    echo "$LATEST_37" > "$BUILD_DIR/runtime.txt"
+                fi
+            fi
+        else
+            PYTHON=$(sed -nr "/^\[metadata\]/ { :l /^python-versions[ ]*=/ { s/.*=[ ]*//; p; q;}; n; b l;}" "$BUILD_DIR/poetry.lock" | tr -d '"^')
+            if ! [ -z $PYTHON]; then
+                if [[ "$PYTHON" == +([0-9]).+([0-9]).+([0-9]) ]]; then
+                    echo "python-$PYTHON" > "$BUILD_DIR/runtime.txt"
+                elif [ $PYTHON = 2.7 ]; then
+                    echo "$LATEST_27" > "$BUILD_DIR/runtime.txt"
+                elif [ "$PYTHON" = 3.4 ]; then
+                    echo "$LATEST_34" > "$BUILD_DIR/runtime.txt"
+                elif [ "$PYTHON" = 3.5 ]; then
+                    echo "$LATEST_35" > "$BUILD_DIR/runtime.txt"
+                elif [ "$PYTHON" = 3.6 ]; then
+                    echo "$LATEST_36" > "$BUILD_DIR/runtime.txt"
+                elif [ "$PYTHON" = 3.7 ]; then
+                    echo "$LATEST_37" > "$BUILD_DIR/runtime.txt"
+                fi
+            fi
+        fi
+    fi
+fi
+
+set -e

bin/utils

@@ -20,7 +20,6 @@ indent() {
   sed "s/^/       /"
 }
 
-
 # Clean up pip output
 cleanup() {
   sed -e 's/\.\.\.\+/.../g' | sed -e '/already satisfied/Id' | sed -e '/No files were found to uninstall/Id' | sed -e '/Overwriting/Id' | sed -e '/python executable/Id' | sed -e '/no previously-included files/Id'