Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
H
heroku-buildpack-python
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Python-Dev
heroku-buildpack-python
Commits
1c458cee
Commit
1c458cee
authored
Feb 16, 2016
by
Kenneth Reitz
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #274 from alex/patch-1
Fixed some broken comments
parents
30cb4ece
433570c2
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
cryptography
bin/steps/cryptography
+3
-3
No files found.
bin/steps/cryptography
View file @
1c458cee
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
#
#
# This script is invoked by [`bin/compile`](/).
# This script is invoked by [`bin/compile`](/).
# The location of the pre-compiled
cryptography
binary.
# The location of the pre-compiled
libffi
binary.
VENDORED_LIBFFI
=
"https://lang-python.s3.amazonaws.com/
$STACK
/libraries/vendor/libffi.tar.gz"
VENDORED_LIBFFI
=
"https://lang-python.s3.amazonaws.com/
$STACK
/libraries/vendor/libffi.tar.gz"
PKG_CONFIG_PATH
=
"/app/.heroku/vendor/lib/pkgconfig:
$PKG_CONFIG_PATH
"
PKG_CONFIG_PATH
=
"/app/.heroku/vendor/lib/pkgconfig:
$PKG_CONFIG_PATH
"
...
@@ -19,7 +19,7 @@ source $BIN_DIR/utils
...
@@ -19,7 +19,7 @@ source $BIN_DIR/utils
bpwatch start libffi_install
bpwatch start libffi_install
# If
pylibmc exists within requirements, use vendored cryptography
.
# If
a package using cffi exists within requirements, use vendored libffi
.
if
(
pip-grep
-s
requirements.txt bcrypt cffi cryptography pyOpenSSL PyOpenSSL requests[security] &> /dev/null
)
then
if
(
pip-grep
-s
requirements.txt bcrypt cffi cryptography pyOpenSSL PyOpenSSL requests[security] &> /dev/null
)
then
if
[
-d
".heroku/vendor/lib/libffi-3.1.1"
]
;
then
if
[
-d
".heroku/vendor/lib/libffi-3.1.1"
]
;
then
...
@@ -27,7 +27,7 @@ if (pip-grep -s requirements.txt bcrypt cffi cryptography pyOpenSSL PyOpenSSL re
...
@@ -27,7 +27,7 @@ if (pip-grep -s requirements.txt bcrypt cffi cryptography pyOpenSSL PyOpenSSL re
else
else
echo
"-----> Noticed cffi. Bootstrapping libffi."
echo
"-----> Noticed cffi. Bootstrapping libffi."
mkdir
-p
.heroku/vendor
mkdir
-p
.heroku/vendor
# Download and extract
cryptography
into target vendor directory.
# Download and extract
libffi
into target vendor directory.
curl
$VENDORED_LIBFFI
-s
|
tar
zxv
-C
.heroku/vendor &> /dev/null
curl
$VENDORED_LIBFFI
-s
|
tar
zxv
-C
.heroku/vendor &> /dev/null
export
LIBFFI
=
$(
pwd
)
/vendor
export
LIBFFI
=
$(
pwd
)
/vendor
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment