Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to pip 19 #833

Merged
merged 4 commits into from
Feb 19, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion bin/compile
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,25 @@ PY27="python-2.7"
# Which stack is used (for binary downloading), if none is provided (e.g. outside of Heroku)?
DEFAULT_PYTHON_STACK="cedar-14"
# If pip doesn't match this version (the version we install), run the installer.
PIP_UPDATE="9.0.2"
PIP_UPDATE="19.2.3"

for file in "$BUILD_DIR/runtime.txt" "$CACHE_DIR/.heroku/python-version" ; do
[ -f "$file" ] || continue

version=$(tr -d '[:space:]' < "$file")

case "$version" in "$PY34"*)
# Python 3.4 support was dropped in pip >= 19.2.
PIP_UPDATE="19.1.1"
break
;;
esac
done

if [[ -f "$BUILD_DIR/Pipfile" ]]; then
# Do not force pipenv users to re-install pipenv locally.
PIP_UPDATE="9.0.2"
fi

export DEFAULT_PYTHON_STACK PIP_UPDATE
export PY37 PY36 PY35 PY27 PY34
Expand Down
21 changes: 18 additions & 3 deletions vendor/pip-pop/pip-diff
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,24 @@ Options:
"""
import os
from docopt import docopt
from pip.req import parse_requirements
from pip.index import PackageFinder
from pip._vendor.requests import session

cjolowicz marked this conversation as resolved.
Show resolved Hide resolved
try: # pip >= 10
from pip._internal.req import parse_requirements
from pip._internal.download import PipSession as session

def PackageFinder(find_links, index_urls, session=None):
from pip._internal.index import PackageFinder
from pip._internal.models.search_scope import SearchScope
from pip._internal.models.selection_prefs import SelectionPreferences

search_scope = SearchScope.create(find_links, index_urls)
selection_prefs = SelectionPreferences(allow_yanked=False)
return PackageFinder.create(search_scope, selection_prefs, session=session)

except ImportError: # pip <= 9.0.3
from pip.req import parse_requirements
from pip.index import PackageFinder
from pip._vendor.requests import session

requests = session()

Expand Down
22 changes: 19 additions & 3 deletions vendor/pip-pop/pip-grep
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,25 @@ Options:
import os
import sys
from docopt import docopt
from pip.req import parse_requirements
from pip.index import PackageFinder
from pip._vendor.requests import session

try: # pip >= 10
from pip._internal.req import parse_requirements
from pip._internal.download import PipSession as session

def PackageFinder(find_links, index_urls, session=None):
from pip._internal.index import PackageFinder
from pip._internal.models.search_scope import SearchScope
from pip._internal.models.selection_prefs import SelectionPreferences

search_scope = SearchScope.create(find_links, index_urls)
selection_prefs = SelectionPreferences(allow_yanked=False)
return PackageFinder.create(search_scope, selection_prefs, session=session)

except ImportError: # pip <= 9.0.3
from pip.req import parse_requirements
from pip.index import PackageFinder
from pip._vendor.requests import session


requests = session()

Expand Down