From c373e80c1285260e5adcbc855f54bbeb6999005c Mon Sep 17 00:00:00 2001
From: Kenneth Reitz <me@kennethreitz.org>
Date: Tue, 6 Mar 2018 16:05:19 -0500
Subject: [PATCH] remove cryptogrpahy step, as they ship wheels now
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
---
bin/compile | 4 ----
bin/steps/cryptography | 38 --------------------------------------
2 files changed, 42 deletions(-)
delete mode 100755 bin/steps/cryptography
diff --git a/bin/compile b/bin/compile
index 8d7db16f..388b03fd 100755
--- a/bin/compile
+++ b/bin/compile
@@ -186,10 +186,6 @@ source "$BIN_DIR/steps/mercurial"
# shellcheck source=bin/steps/pylibmc
source "$BIN_DIR/steps/pylibmc"
-# Libffi support.
-# shellcheck source=bin/steps/cryptography
-source "$BIN_DIR/steps/cryptography"
-
# Support for Geo libraries.
# shellcheck source=bin/steps/geo-libs
sub_env "$BIN_DIR/steps/geo-libs"
diff --git a/bin/steps/cryptography b/bin/steps/cryptography
deleted file mode 100755
index 66c56885..00000000
--- a/bin/steps/cryptography
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/env bash
-
-# This script serves as the cffi build step of the
-# [**Python Buildpack**](https://github.com/heroku/heroku-buildpack-python)
-# compiler.
-#
-# A [buildpack](https://devcenter.heroku.com/articles/buildpacks) is an
-# adapter between a Python application and Heroku's runtime.
-#
-# This script is invoked by [`bin/compile`](/).
-
-if [[ "$STACK" == "heroku-16" ]]; then
- # libffi is pre-installed in the stack image so there is no need to vendor it.
- return 0
-fi
-
-# The location of the pre-compiled libffi binary.
-VENDORED_LIBFFI="${VENDOR_URL}/libraries/vendor/libffi.tar.gz"
-
-PKG_CONFIG_PATH="/app/.heroku/vendor/lib/pkgconfig:$PKG_CONFIG_PATH"
-
-# Syntax sugar.
-# shellcheck source=bin/utils
-source "$BIN_DIR/utils"
-
-# If a package using cffi exists within requirements, use vendored libffi.
-if (pip-grep -s requirements.txt argon2-cffi bcrypt cffi cryptography django[argon2] Django[argon2] django[bcrypt] Django[bcrypt] PyNaCl pyOpenSSL PyOpenSSL requests[security] misaka &> /dev/null) then
-
- if [ ! -d ".heroku/vendor/lib/libffi-3.1" ]; then
- echo "-----> Noticed cffi. Bootstrapping libffi."
- mkdir -p .heroku/vendor
- # Download and extract libffi into target vendor directory.
- curl "$VENDORED_LIBFFI" -s | tar zxv -C .heroku/vendor &> /dev/null
- fi
-
- LIBFFI=$(pwd)/vendor
- export LIBFFI
-fi
--
GitLab