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 Pex 2.1.50 and leverage packed layout. (Cherry picks of 433a4dd 0d36002 7ba06a5) #13078

Merged
merged 4 commits into from Oct 1, 2021

Conversation

jsirois
Copy link
Member

@jsirois jsirois commented Oct 1, 2021

This is a three-part-cherry-pick:

  1. Upgrade to Pex 2.1.48 and leverage packed layout. (Upgrade to Pex 2.1.48 and leverage packed layout. #12808)

Pex 2.1.48 brings --layout {packed,loose} alternate layouts for PEXes.
These are both more friendly to remote caching, leading to smaller
artifacts to cache and greater cache hit ratios in the face of
requirement changes. Since the loose layout still does not perform well
with the local CAS scheme, we use packed for now.

Fixes #12548
Fixes #12688
Fixes #12803

(cherry picked from commit 433a4dd)

  1. Upgrade to Pex 2.1.49. (Upgrade to Pex 2.1.49. #12853)

This fixes a bug activating previously --not-zip-safe dependency-only
PEXes, which Pants used extensively before the Pex 2.1.48 upgrade.

(cherry picked from commit 0d36002)

  1. Upgrade to Pex 2.1.50. (Upgrade to Pex 2.1.50. #12888)

This fixes a bug executing PEX zipapps that do not have the execute bit
set, which is the case for the Pex PEX we download and run in the
release script.

(cherry picked from commit 7ba06a5)

With a fourth commit that applies ./build-support/bin/generate_all_lockfiles.sh.

Fixes #13075

Pex 2.1.48 brings `--layout {packed,loose}` alternate layouts for PEXes.
These are both more friendly to remote caching, leading to smaller
artifacts to cache and greater cache hit ratios in the face of
requirement changes. Since the loose layout still does not perform well
with the local CAS scheme, we use packed for now.

Fixes pantsbuild#12548
Fixes pantsbuild#12688
Fixes pantsbuild#12803

(cherry picked from commit 433a4dd)

# Rust tests and lints will be skipped. Delete if not intended.
[ci skip-rust]

# Building wheels and fs_util will be skipped. Delete if not intended.
[ci skip-build-wheels]
This fixes a bug activating previously `--not-zip-safe` dependency-only
PEXes, which Pants used extensively before the Pex 2.1.48 upgrade.

(cherry picked from commit 0d36002)

# Rust tests and lints will be skipped. Delete if not intended.
[ci skip-rust]

# Building wheels and fs_util will be skipped. Delete if not intended.
[ci skip-build-wheels]
This fixes a bug executing PEX zipapps that do not have the execute bit
set, which is the case for the Pex PEX we download and run in the
release script.

(cherry picked from commit 7ba06a5)

# Rust tests and lints will be skipped. Delete if not intended.
[ci skip-rust]

# Building wheels and fs_util will be skipped. Delete if not intended.
[ci skip-build-wheels]
# Building wheels and fs_util will be skipped. Delete if not intended.
[ci skip-build-wheels]

# Rust tests and lints will be skipped. Delete if not intended.
[ci skip-rust]
@jsirois
Copy link
Member Author

jsirois commented Oct 1, 2021

I'm open to how to structure this. The additional cherry-picks are needed to avoid issues with the PEX_ROOT from old Pex versions and to ensure the release script works.

Copy link
Sponsor Member

@stuhood stuhood left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks a lot for doing this!

And FWIW, I'm glad it got the extra bake time on master, since it gave us time to find #13008 (which is already picked).

  1. Upgrade to Pex 2.1.49. Shield isolated-Sessions / StreamingWorkunitHandlers from Ctrl+C. (cherrypick of #12483) #12485

The PR description mentions #12485, which probably isn't right.

@stuhood stuhood added this to the 2.7.x milestone Oct 1, 2021
@jsirois
Copy link
Member Author

jsirois commented Oct 1, 2021

And FWIW, I'm glad it got the extra bake time on master, since it gave us time to find #13008 (which is already picked).

Yes, agreed!

The PR description mentions #12485, which probably isn't right.

Fixed.

@jsirois jsirois merged commit 305ab96 into pantsbuild:2.7.x Oct 1, 2021
@jsirois jsirois deleted the issues/13075 branch October 1, 2021 23:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants