forked from heroku/heroku-buildpack-python
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert "Update pip to 20.3.4/21.3.1 (new dependency resolver) (heroku…
…#1259)" This reverts commit b82ddba. This was done to unblock Zenput deployments. See https://zenput.atlassian.net/browse/ZP-7880
- Loading branch information
1 parent
98242c0
commit 7d3b3b2
Showing
6 changed files
with
54 additions
and
48 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -22,7 +22,7 @@ | |
| remote: -----> No Python version was specified. Using the buildpack default: python-#{DEFAULT_PYTHON_VERSION} | ||
| remote: To use a different version, see: https://devcenter.heroku.com/articles/python-runtimes | ||
| remote: -----> Installing python-#{DEFAULT_PYTHON_VERSION} | ||
| remote: -----> Installing pip 21.3.1, setuptools 57.5.0 and wheel 0.37.0 | ||
| remote: -----> Installing pip 20.2.4, setuptools 57.5.0 and wheel 0.37.0 | ||
| remote: -----> Installing SQLite3 | ||
| remote: -----> Installing requirements with pip | ||
| remote: Collecting urllib3 | ||
|
|
@@ -38,7 +38,7 @@ | |
| remote: To use a different version, see: https://devcenter.heroku.com/articles/python-runtimes | ||
| remote: -----> No change in requirements detected, installing from cache | ||
| remote: -----> Using cached install of python-#{DEFAULT_PYTHON_VERSION} | ||
| remote: -----> Installing pip 21.3.1, setuptools 57.5.0 and wheel 0.37.0 | ||
| remote: -----> Installing pip 20.2.4, setuptools 57.5.0 and wheel 0.37.0 | ||
| remote: -----> Installing SQLite3 | ||
| remote: -----> Installing requirements with pip | ||
| remote: -----> Discovering process types | ||
|
|
@@ -61,7 +61,7 @@ | |
| remote: To use a different version, see: https://devcenter.heroku.com/articles/python-runtimes | ||
| remote: -----> Requirements file has been changed, clearing cached dependencies | ||
| remote: -----> Installing python-#{DEFAULT_PYTHON_VERSION} | ||
| remote: -----> Installing pip 21.3.1, setuptools 57.5.0 and wheel 0.37.0 | ||
| remote: -----> Installing pip 20.2.4, setuptools 57.5.0 and wheel 0.37.0 | ||
| remote: -----> Installing SQLite3 | ||
| remote: -----> Installing requirements with pip | ||
| remote: Collecting urllib3 | ||
|
|
@@ -94,14 +94,21 @@ | |
| it 'rewrites .pth and .egg-link paths correctly for hooks, later buildpacks, runtime and cached builds' do | ||
| app.deploy do |app| | ||
| expect(clean_output(app.output)).to match(Regexp.new(<<~REGEX)) | ||
| remote: Successfully installed gunicorn-20.1.0 local-package-0.0.1 | ||
| remote: -----> Installing requirements with pip | ||
| remote: Obtaining file:///tmp/build_.*/local_package \\(from -r /tmp/build_.*/requirements.txt \\(line 1\\)\\) | ||
| remote: Obtaining gunicorn from git\\+https://github.com/benoitc/[email protected]#egg=gunicorn \\(from -r /tmp/build_.*/requirements.txt \\(line 2\\)\\) | ||
| remote: Cloning https://github.com/benoitc/gunicorn \\(to revision 20.1.0\\) to /app/.heroku/src/gunicorn | ||
| remote: Installing collected packages: gunicorn, local-package | ||
| remote: Running setup.py develop for gunicorn | ||
| remote: Running setup.py develop for local-package | ||
| remote: Successfully installed gunicorn local-package | ||
| remote: -----> Running post-compile hook | ||
| remote: ==> .heroku/python/lib/python.*/site-packages/distutils-precedence.pth <== | ||
| remote: .* | ||
| remote: import os; var = 'SETUPTOOLS_USE_DISTUTILS'; enabled = os.environ.get\\(var, 'stdlib'\\) == 'local'; enabled and __import__\\('_distutils_hack'\\).add_shim\\(\\); | ||
| remote: | ||
| remote: ==> .heroku/python/lib/python.*/site-packages/easy-install.pth <== | ||
| remote: /tmp/build_.*/local_package | ||
| remote: /app/.heroku/src/gunicorn | ||
| remote: /tmp/build_.*/local_package | ||
| remote: | ||
| remote: ==> .heroku/python/lib/python.*/site-packages/gunicorn.egg-link <== | ||
| remote: /app/.heroku/src/gunicorn | ||
|
|
@@ -113,11 +120,11 @@ | |
| remote: Running entrypoint for the VCS package: gunicorn \\(version 20.1.0\\) | ||
| remote: -----> Inline app detected | ||
| remote: ==> .heroku/python/lib/python.*/site-packages/distutils-precedence.pth <== | ||
| remote: .* | ||
| remote: import os; var = 'SETUPTOOLS_USE_DISTUTILS'; enabled = os.environ.get\\(var, 'stdlib'\\) == 'local'; enabled and __import__\\('_distutils_hack'\\).add_shim\\(\\); | ||
| remote: | ||
| remote: ==> .heroku/python/lib/python.*/site-packages/easy-install.pth <== | ||
| remote: /tmp/build_.*/local_package | ||
| remote: /app/.heroku/src/gunicorn | ||
| remote: /tmp/build_.*/local_package | ||
| remote: | ||
| remote: ==> .heroku/python/lib/python.*/site-packages/gunicorn.egg-link <== | ||
| remote: /app/.heroku/src/gunicorn | ||
|
|
@@ -132,11 +139,11 @@ | |
| # Test rewritten paths work at runtime. | ||
| expect(app.run('bin/test-entrypoints')).to match(Regexp.new(<<~REGEX)) | ||
| ==> .heroku/python/lib/python.*/site-packages/distutils-precedence.pth <== | ||
| .* | ||
| import os; var = 'SETUPTOOLS_USE_DISTUTILS'; enabled = os.environ.get\\(var, 'stdlib'\\) == 'local'; enabled and __import__\\('_distutils_hack'\\).add_shim\\(\\); | ||
| ==> .heroku/python/lib/python.*/site-packages/easy-install.pth <== | ||
| /app/local_package | ||
| /app/.heroku/src/gunicorn | ||
| /app/local_package | ||
| ==> .heroku/python/lib/python.*/site-packages/gunicorn.egg-link <== | ||
| /app/.heroku/src/gunicorn | ||
|
|
@@ -148,14 +155,25 @@ | |
| Running entrypoint for the VCS package: gunicorn \\(version 20.1.0\\) | ||
| REGEX | ||
|
|
||
| # Test that the cached .pth files work correctly. | ||
| # Test restoring paths in the cached .pth files works correctly. | ||
| app.commit! | ||
| app.push! | ||
| expect(clean_output(app.output)).to match(Regexp.new(<<~REGEX)) | ||
| remote: Successfully installed gunicorn-20.1.0 local-package-0.0.1 | ||
| remote: -----> No change in requirements detected, installing from cache | ||
| remote: -----> Using cached install of python-#{DEFAULT_PYTHON_VERSION} | ||
| remote: -----> Installing pip 20.2.4, setuptools 57.5.0 and wheel 0.37.0 | ||
| remote: -----> Installing SQLite3 | ||
| remote: -----> Installing requirements with pip | ||
| remote: Obtaining file:///tmp/build_.*/local_package \\(from -r /tmp/build_.*/requirements.txt \\(line 1\\)\\) | ||
| remote: Obtaining gunicorn from git\\+https://github.com/benoitc/[email protected]#egg=gunicorn \\(from -r /tmp/build_.*/requirements.txt \\(line 2\\)\\) | ||
| remote: Cloning https://github.com/benoitc/gunicorn \\(to revision 20.1.0\\) to /app/.heroku/src/gunicorn | ||
| remote: Installing collected packages: gunicorn, local-package | ||
| remote: Running setup.py develop for gunicorn | ||
| remote: Running setup.py develop for local-package | ||
| remote: Successfully installed gunicorn local-package | ||
| remote: -----> Running post-compile hook | ||
| remote: ==> .heroku/python/lib/python.*/site-packages/distutils-precedence.pth <== | ||
| remote: .* | ||
| remote: import os; var = 'SETUPTOOLS_USE_DISTUTILS'; enabled = os.environ.get\\(var, 'stdlib'\\) == 'local'; enabled and __import__\\('_distutils_hack'\\).add_shim\\(\\); | ||
| remote: | ||
| remote: ==> .heroku/python/lib/python.*/site-packages/easy-install.pth <== | ||
| remote: /app/.heroku/src/gunicorn | ||
|
|
@@ -171,7 +189,7 @@ | |
| remote: Running entrypoint for the VCS package: gunicorn \\(version 20.1.0\\) | ||
| remote: -----> Inline app detected | ||
| remote: ==> .heroku/python/lib/python.*/site-packages/distutils-precedence.pth <== | ||
| remote: .* | ||
| remote: import os; var = 'SETUPTOOLS_USE_DISTUTILS'; enabled = os.environ.get\\(var, 'stdlib'\\) == 'local'; enabled and __import__\\('_distutils_hack'\\).add_shim\\(\\); | ||
| remote: | ||
| remote: ==> .heroku/python/lib/python.*/site-packages/easy-install.pth <== | ||
| remote: /app/.heroku/src/gunicorn | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters