Skip to content

Commit

Permalink
Upgrade to a patched Pip 20.3.3. (#1143)
Browse files Browse the repository at this point in the history
This brings in a fix for `pip download --constraint` as well as support
for Python 3.10.

See: pypa/pip#9283
  • Loading branch information
jsirois authored Dec 15, 2020
1 parent 618cfa4 commit 8d4f3db
Show file tree
Hide file tree
Showing 49 changed files with 751 additions and 172 deletions.
14 changes: 11 additions & 3 deletions pex/vendor/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,18 +107,26 @@ def iter_vendor_specs():
"""
# We use this via pex.third_party at runtime to check for compatible wheel tags and at build
# time to implement resolving distributions from a PEX repository.
yield VendorSpec.pinned("packaging", "20.7")
yield VendorSpec.pinned("packaging", "20.8")

# We shell out to pip at buildtime to resolve and install dependencies.
yield VendorSpec.pinned("pip", "20.3.1", rewrite=False)
# N.B.: We're currently using a patched version of Pip 20.3.3 housed at
# https://github.com/pantsbuild/pip/tree/pex/patches/generation-2. The patch works around a bug
# in `pip download --constraint...` tracked at https://github.com/pypa/pip/issues/9283 and fixed
# by https://github.com/pypa/pip/pull/9301 there and https://github.com/pantsbuild/pip/pull/8 in
# our fork.
yield VendorSpec.vcs(
"git+https://github.com/pantsbuild/pip@06f462537c981116c763c1ba40cf40e9dd461bcf#egg=pip",
rewrite=False,
)

# We expose this to pip at buildtime for legacy builds, but we also use pkg_resources via
# pex.third_party at runtime in various ways.
# N.B.: 44.0.0 is the last setuptools version compatible with Python 2.
yield VendorSpec.pinned("setuptools", "44.0.0")

# We expose this to pip at buildtime for legacy builds.
yield VendorSpec.pinned("wheel", "0.36.1", rewrite=False)
yield VendorSpec.pinned("wheel", "0.36.2", rewrite=False)


def vendor_runtime(chroot, dest_basedir, label, root_module_names):
Expand Down
2 changes: 1 addition & 1 deletion pex/vendor/_vendored/packaging/constraints.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
packaging==20.7
packaging==20.8
pyparsing==2.4.7
104 changes: 0 additions & 104 deletions pex/vendor/_vendored/packaging/packaging-20.7.dist-info/METADATA

This file was deleted.

Loading

0 comments on commit 8d4f3db

Please sign in to comment.