From d35ee2c14c8c42bc40f9c5ced1252c8d10a3ab1a Mon Sep 17 00:00:00 2001 From: Kenneth Reitz <me@kennethreitz.org> Date: Mon, 19 Dec 2016 16:31:29 -0500 Subject: [PATCH] Squashed commit of the following: commit 554a8bbae6412031fc22b4dfeba0238be4ad7246 Author: Kenneth Reitz <me@kennethreitz.org> Date: Mon Dec 19 16:26:18 2016 -0500 comment out debugging line commit 6572ad3d44de2364de4cde57fc457256112b1f0b Author: Kenneth Reitz <me@kennethreitz.org> Date: Mon Dec 19 16:21:03 2016 -0500 test commit 35cabaeebc1386541f7e5520c99726edc5a3d44d Author: Kenneth Reitz <me@kennethreitz.org> Date: Mon Dec 19 16:09:21 2016 -0500 try . commit 300285a92d6c12923cd11c33454e3cba57bd523d Author: Kenneth Reitz <me@kennethreitz.org> Date: Mon Dec 19 16:05:22 2016 -0500 find commit 7a6f1eb010d40ffdcebb99e731dedb8bd2d806c6 Author: Kenneth Reitz <me@kennethreitz.org> Date: Mon Dec 19 16:02:24 2016 -0500 find commit 66d754978e101ab9e915aaa32c6f23f9a8c09b3c Author: Kenneth Reitz <me@kennethreitz.org> Date: Mon Dec 19 15:55:04 2016 -0500 fix xargs commit 9c222a9350b622ac0f03341eef2b8701b3a847b5 Author: Kenneth Reitz <me@kennethreitz.org> Date: Mon Dec 19 15:53:04 2016 -0500 copy src commit 7f4273f47f65cf584b0e22c17cb9cf2bec0eb873 Author: Kenneth Reitz <me@kennethreitz.org> Date: Mon Dec 19 15:45:20 2016 -0500 new replace script commit dd707c21e3998af3d6b40a2ec9e0124845ca71a2 Author: Kenneth Reitz <me@kennethreitz.org> Date: Mon Dec 19 15:40:35 2016 -0500 re-write egg-links --- bin/steps/pip-install | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bin/steps/pip-install b/bin/steps/pip-install index 7dea3cea..80435211 100755 --- a/bin/steps/pip-install +++ b/bin/steps/pip-install @@ -20,6 +20,11 @@ fi cp requirements.txt .heroku/python/requirements-declared.txt /app/.heroku/python/bin/pip freeze --disable-pip-version-check > .heroku/python/requirements-installed.txt +# Replace egg-links with new paths for /app. +# find .heroku/python/lib/python*/site-packages/ -name "*.egg-link" -print0 | xargs -0 cat +find .heroku/python/lib/python*/site-packages/ -name "*.egg-link" -print0 | xargs -0 -n 1 sed -i -e "s#$(pwd)/#./app/#" +find .heroku/python/lib/python*/site-packages/ -name "easy-install.pth" -print0 | xargs -0 -n 1 sed -i -e "s#$(pwd)/#/app/#" + [ ! "$FRESH_PYTHON" ] && bpwatch stop pip_install [ "$FRESH_PYTHON" ] && bpwatch stop pip_install_first -- GitLab