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.

Sign up for GitHub

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

bpo-38488: Upgrade bundled versions of pip & setuptools #16782

Merged
merged 1 commit into from
May 27, 2020
Merged

bpo-38488: Upgrade bundled versions of pip & setuptools #16782

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions Lib/ensurepip/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
__all__ = ["version", "bootstrap"]


_SETUPTOOLS_VERSION = "41.2.0"
_SETUPTOOLS_VERSION = "46.1.3"

_PIP_VERSION = "19.2.3"
_PIP_VERSION = "20.1"

_PROJECTS = [
("setuptools", _SETUPTOOLS_VERSION),
("pip", _PIP_VERSION),
("setuptools", _SETUPTOOLS_VERSION, 'py3'),
("pip", _PIP_VERSION, 'py2.py3'),
]


Expand Down Expand Up @@ -107,8 +107,8 @@ def _bootstrap(*, root=None, upgrade=False, user=False,
# Put our bundled wheels into a temporary directory and construct the
# additional paths that need added to sys.path
additional_paths = []
for project, version in _PROJECTS:
wheel_name = "{}-{}-py2.py3-none-any.whl".format(project, version)
for project, version, py_tag in _PROJECTS:
wheel_name = "{}-{}-{}-none-any.whl".format(project, version, py_tag)
whl = resources.read_binary(
_bundled,
wheel_name,
Expand Down
Binary file removed Lib/ensurepip/_bundled/pip-19.2.3-py2.py3-none-any.whl
View file
Open in desktop
Binary file not shown.
Binary file added Lib/ensurepip/_bundled/pip-20.1-py2.py3-none-any.whl
View file
Open in desktop
Binary file not shown.
Binary file renamed ...ed/setuptools-41.2.0-py2.py3-none-any.whl → ...undled/setuptools-46.1.3-py3-none-any.whl
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Library/2019-10-15-23-28-11.bpo-38488.hFQNgA.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update ensurepip to install pip 20.1 and setuptools 46.1.3.