Support poetry.lock

bin/compile

@@ -257,6 +257,10 @@ mtime "python.install.time" "${start}"
 # shellcheck source=bin/steps/pipenv
 source "$BIN_DIR/steps/pipenv"
 
+# Export requirements.txt from poetry.lock, if present.
+# 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.
@@ -268,9 +272,8 @@ mtime "pip.uninstall.time" "${start}"
 # If no requirements.txt file given, assume `setup.py develop` is intended.
 # 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
-  echo "-e ." > requirements.txt
+if [ ! -f requirements.txt ] && [ ! -f Pipfile ] && [ ! -f pyproject.toml ]; then
+    echo "-e ." > requirements.txt
 fi
 
 # Fix egg-links.

bin/detect

@@ -15,7 +15,7 @@
 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/pyproject.toml" ]; then
   exit 1
 fi
 

bin/steps/pip-install

@@ -34,15 +34,26 @@ if [ ! "$SKIP_PIP_INSTALL" ]; then
     mcount "tool.pip"
 
     # Count expected build failures.
-    if grep -q '==0.0.0' requirements.txt; then
+    if [ -f requirements.txt ] && grep -q '==0.0.0' requirements.txt; then
         mcount "failure.none-version"
     fi
 
     if [ ! -f "$BUILD_DIR/.heroku/python/bin/pip" ]; then
         exit 1
     fi
-    /app/.heroku/python/bin/pip install -r "$BUILD_DIR/requirements.txt" --exists-action=w --src=/app/.heroku/src --disable-pip-version-check --no-cache-dir 2>&1 | tee "$WARNINGS_LOG" | cleanup | indent
-    PIP_STATUS="${PIPESTATUS[0]}"
+
+    if [ -f requirements.txt ]; then
+        /app/.heroku/python/bin/pip install -r "$BUILD_DIR/requirements.txt" --exists-action=w --src=/app/.heroku/src --disable-pip-version-check --no-cache-dir 2>&1 | tee "$WARNINGS_LOG" | cleanup | indent
+        PIP_STATUS="${PIPESTATUS[0]}"
+    else
+        PIP_STATUS=0
+    fi
+
+    if [ "$PIP_STATUS" -eq 0 ] && [ -f pyproject.toml ]; then
+        /app/.heroku/python/bin/pip install . --exists-action=w --disable-pip-version-check --no-cache-dir 2>&1 | tee -a "$WARNINGS_LOG" | cleanup | indent
+        PIP_STATUS="${PIPESTATUS[0]}"
+    fi
+
     set -e
 
     show-warnings
@@ -53,8 +64,10 @@ if [ ! "$SKIP_PIP_INSTALL" ]; then
     fi
 
     # Smart Requirements handling
-    cp requirements.txt .heroku/python/requirements-declared.txt
-    /app/.heroku/python/bin/pip freeze --disable-pip-version-check > .heroku/python/requirements-installed.txt
+    if [ -f requirements.txt ]; then
+        cp requirements.txt .heroku/python/requirements-declared.txt
+        /app/.heroku/python/bin/pip freeze --disable-pip-version-check > .heroku/python/requirements-installed.txt
+    fi
 
     echo
 

bin/steps/pip-uninstall

@@ -5,7 +5,7 @@ set +e
 # shellcheck source=bin/utils
 source "$BIN_DIR/utils"
 
-if [ ! "$SKIP_PIP_INSTALL" ]; then
+if [ ! "$SKIP_PIP_INSTALL" ] && [ -f requirements.txt ]; then
 
   if [[ -f .heroku/python/requirements-declared.txt ]]; then
 

bin/steps/poetry

@@ -0,0 +1,63 @@
+#!/usr/bin/env bash
+
+set -e
+
+# shellcheck source=bin/utils
+source "$BIN_DIR/utils"
+
+if [ ! -f requirements.txt ] && [ -f pyproject.toml ] && [ -f poetry.lock ]; then
+    # Measure that we're using Poetry.
+    mcount "tool.poetry"
+
+    # Hash poetry.lock to detect changes.
+    POETRY_LOCK_SHA=$(openssl dgst -sha256 poetry.lock)
+
+    # Use cached requirements.txt if poetry.lock is unchanged.
+    CACHED_REQUIREMENTS=$CACHE_DIR/requirements.txt
+    CACHED_POETRY_LOCK_SHA=$CACHE_DIR/poetry.lock.sha256
+
+    if [ -f "$CACHED_REQUIREMENTS" ] && [ -f "$CACHED_POETRY_LOCK_SHA" ] &&
+           [ "$POETRY_LOCK_SHA" == "$(cat "$CACHED_POETRY_LOCK_SHA")" ]; then
+        echo "Skipping requirements export, as poetry.lock hasn't changed since last deploy." | indent
+        cp "$CACHED_REQUIREMENTS" requirements.txt
+    else
+        # Set environment variables for pip
+        # 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
+
+        # Install Poetry.
+        #
+        # Poetry is not used to install the project because it does not clean up
+        # stale requirements (see sdispater/poetry#648), so we need to export
+        # requirements.txt anyway for the pip-uninstall step.
+        #
+        # Since we only use Poetry to export a requirements.txt file, ignore the
+        # Poetry version specified in pyproject.toml. Install a pre-release of
+        # 1.0.0 because the export command is not available before 1.0.0a0.
+        export POETRY_VERSION="1.0.0b7"
+        puts-step "Exporting requirements with Poetry $POETRY_VERSION…"
+        /app/.heroku/python/bin/pip install "poetry==$POETRY_VERSION" \
+            --disable-pip-version-check &> /dev/null
+
+        # Export requirements.
+        /app/.heroku/python/bin/poetry export -f requirements.txt -o requirements.txt
+
+        # Write SHA and requirements.txt to cache dir.
+        echo "$POETRY_LOCK_SHA" > "$CACHED_POETRY_LOCK_SHA"
+        cp requirements.txt "$CACHED_REQUIREMENTS"
+    fi
+fi

test/fixtures/flit-requires/foobar.py

@@ -0,0 +1,3 @@
+"""An amazing sample package!"""
+
+__version__ = '0.1'

test/fixtures/flit-requires/pyproject.toml

@@ -0,0 +1,10 @@
+[build-system]
+requires = ["flit"]
+build-backend = "flit.buildapi"
+
+[tool.flit.metadata]
+module = "foobar"
+author = "Sir Robin"
+author-email = "[email protected]"
+home-page = "https://github.com/sirrobin/foobar"
+requires = ["attrs >=19.1.0"]

test/fixtures/flit/foobar.py

@@ -0,0 +1,3 @@
+"""An amazing sample package!"""
+
+__version__ = '0.1'

test/fixtures/flit/pyproject.toml

@@ -0,0 +1,9 @@
+[build-system]
+requires = ["flit"]
+build-backend = "flit.buildapi"
+
+[tool.flit.metadata]
+module = "foobar"
+author = "Sir Robin"
+author-email = "[email protected]"
+home-page = "https://github.com/sirrobin/foobar"

test/fixtures/poetry-lock/pyproject.toml

@@ -0,0 +1,15 @@
+[tool.poetry]
+name = "foobar"
+version = "0.1.0"
+description = ""
+authors = ["Your Name <[email protected]>"]
+
+[tool.poetry.dependencies]
+python = "^3.6"
+marshmallow = "^3.0.0"
+
+[tool.poetry.dev-dependencies]
+
+[build-system]
+requires = ["poetry>=0.12"]
+build-backend = "poetry.masonry.api"

test/fixtures/poetry/pyproject.toml

@@ -0,0 +1,14 @@
+[tool.poetry]
+name = "foobar"
+version = "0.1.0"
+description = ""
+authors = ["Your Name <[email protected]>"]
+
+[tool.poetry.dependencies]
+python = "^3.6"
+
+[tool.poetry.dev-dependencies]
+
+[build-system]
+requires = ["poetry>=0.12"]
+build-backend = "poetry.masonry.api"

test/fixtures/pyproject-toml/pyproject.toml

@@ -0,0 +1,3 @@
+[build-system]
+requires = ["setuptools", "wheel"]
+build-backend = "setuptools.build_meta:__legacy__"

test/fixtures/pyproject-toml/setup.py

@@ -0,0 +1,4 @@
+from setuptools import setup
+
+
+setup(name="foobar", version="1.0.0")

test/run-features

@@ -70,6 +70,32 @@ testPipenvFullVersion() {
   assertCapturedSuccess
 }
 
+testPyProjectToml() {
+    compile "pyproject-toml"
+    assertCapturedSuccess
+}
+
+testPoetry() {
+    compile "poetry"
+    assertCapturedSuccess
+}
+
+testPoetryLock() {
+    compile "poetry-lock"
+    assertCaptured "marshmallow==3.0.0"
+    assertCapturedSuccess
+}
+
+testFlit() {
+    compile "flit"
+    assertCapturedSuccess
+}
+
+testFlitRequires() {
+    compile "flit-requires"
+    assertCapturedSuccess
+}
+
 testNoRequirements() {
   compile "no-requirements"
   assertCapturedError