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

Jump to bottom

upgrade Pex to 2.2.1 #20587

Merged
merged 1 commit into from
Feb 21, 2024
Merged

upgrade Pex to 2.2.1 #20587

merged 1 commit into from
Feb 21, 2024

Conversation

cburroughs
Copy link
Contributor

Changelogs:

(New home, new docs, but no direct Pants related changes.)

Lockfile diff: 3rdparty/python/user_reqs.lock [python-default]

==                    Upgraded dependencies                     ==

  cryptography                   42.0.2       -->   42.0.3
  pex                            2.1.163      -->   2.2.1
  urllib3                        2.2.0        -->   2.2.1

@cburroughs
upgrade Pex to 2.2.2
b9e3e25 
Changelogs:
 * https://github.com/pex-tool/pex/releases/tag/v2.1.164
 * https://github.com/pex-tool/pex/releases/tag/v2.2.0
 * https://github.com/pex-tool/pex/releases/tag/v2.2.1

(New home, new docs, but no direct Pants related changes.)

```
Lockfile diff: 3rdparty/python/user_reqs.lock [python-default]

==                    Upgraded dependencies                     ==

  cryptography                   42.0.2       -->   42.0.3
  pex                            2.1.163      -->   2.2.1
  urllib3                        2.2.0        -->   2.2.1
```
@cburroughs cburroughs self-assigned this Feb 20, 2024
@cburroughs cburroughs added category:internal CI, fixes for not-yet-released features, etc. backend: Python Python backend-related issues labels Feb 20, 2024
huonw
huonw approved these changes Feb 20, 2024
View reviewed changes
Copy link
Contributor

@huonw huonw left a comment

Choose a reason for hiding this comment

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

Thanks

@cburroughs cburroughs changed the title upgrade Pex to 2.2.2 upgrade Pex to 2.2.1 Feb 21, 2024
@huonw huonw merged commit 62828b7 into pantsbuild:main Feb 21, 2024
24 checks passed
@yjabri yjabri mentioned this pull request Mar 7, 2024
Closed
@huonw huonw added this to the 2.19.x milestone Mar 7, 2024
WorkerPants pushed a commit that referenced this pull request Mar 7, 2024
@cburroughs @WorkerPants
upgrade Pex to 2.2.1 (#20587)
f7f4c63 
Changelogs:
 * https://github.com/pex-tool/pex/releases/tag/v2.1.164
 * https://github.com/pex-tool/pex/releases/tag/v2.2.0
 * https://github.com/pex-tool/pex/releases/tag/v2.2.1

(New home, new docs, but no direct Pants related changes.)

```
Lockfile diff: 3rdparty/python/user_reqs.lock [python-default]

==                    Upgraded dependencies                     ==

  cryptography                   42.0.2       -->   42.0.3
  pex                            2.1.163      -->   2.2.1
  urllib3                        2.2.0        -->   2.2.1
```
@WorkerPants
Copy link
Member

I tried to automatically cherry-pick this change back to each relevant milestone, so that it is available in those older releases of Pants.

❌ 2.19.x

I was unable to cherry-pick this PR to 2.19.x, likely due to merge-conflicts.

Steps to Cherry-Pick locally

To resolve:

  1. (Ensure your git working directory is clean)
  2. Run the following script to reproduce the merge-conflicts: 
    git fetch https://github.com/pantsbuild/pants main \
  && git fetch https://github.com/pantsbuild/pants 2.19.x \
  && git checkout -b cherry-pick-20587-to-2.19.x FETCH_HEAD \
  && git cherry-pick 62828b7f56abeeea79b9249b8d97ae7d78847785
  3. Fix the merge conflicts and commit the changes
  4. Run build-support/cherry_pick/make_pr.sh "20587" "2.19.x"

Please note that I cannot re-run CI if a job fails. Please work with your PR approver(s) to re-run CI if necessary.

✔️ 2.20.x

Successfully opened #20652.

When you're done manually cherry-picking, please remove the needs-cherrypick label on this PR.

Thanks again for your contributions!

🤖 Beep Boop here's my run link

@WorkerPants WorkerPants added the auto-cherry-picking-failed Auto Cherry-Picking Failed label Mar 7, 2024
@huonw
Copy link
Contributor

huonw commented Mar 7, 2024

The cherry-pick is in response to #20651. I'll do the manual resolution.

huonw pushed a commit that referenced this pull request Mar 7, 2024
@cburroughs @huonw
upgrade Pex to 2.2.1 (#20587)
189e5b8 
Changelogs:
 * https://github.com/pex-tool/pex/releases/tag/v2.1.164
 * https://github.com/pex-tool/pex/releases/tag/v2.2.0
 * https://github.com/pex-tool/pex/releases/tag/v2.2.1

(New home, new docs, but no direct Pants related changes.)

```
Lockfile diff: 3rdparty/python/user_reqs.lock [python-default]

==                    Upgraded dependencies                     ==

  cryptography                   42.0.2       -->   42.0.3
  pex                            2.1.163      -->   2.2.1
  urllib3                        2.2.0        -->   2.2.1
```
@huonw huonw mentioned this pull request Mar 7, 2024
Merged
huonw added a commit that referenced this pull request Mar 7, 2024
@huonw @cburroughs
upgrade Pex to 2.2.1 (Cherry-pick of #20587, etc.) (#20653)
3299a32 
Cherry pick of #20587 , which includes:

- #20587
- #20502
- #20496
- #20416
- #20391
- #20149

The upgrade past https://github.com/pex-tool/pex/releases/tag/v2.1.154
is what is acutely driving this cherry-pick, as it resolves the
over-long shebang issue (#20651) where the Pants `bin/pants` script can
have a `#!...` line that's too long.

Closes #20651

Co-authored-by: cburroughs <[email protected]>
huonw pushed a commit that referenced this pull request Mar 7, 2024
@WorkerPants @cburroughs
upgrade Pex to 2.2.1 (Cherry-pick of #20587) (#20652)
636003a 
Changelogs:
 * https://github.com/pex-tool/pex/releases/tag/v2.1.164
 * https://github.com/pex-tool/pex/releases/tag/v2.2.0
 * https://github.com/pex-tool/pex/releases/tag/v2.2.1

(New home, new docs, but no direct Pants related changes.)

```
Lockfile diff: 3rdparty/python/user_reqs.lock [python-default]

==                    Upgraded dependencies                     ==

  cryptography                   42.0.2       -->   42.0.3
  pex                            2.1.163      -->   2.2.1
  urllib3                        2.2.0        -->   2.2.1
```

Co-authored-by: cburroughs <[email protected]>
@huonw huonw added needs-cherrypick auto-cherry-picking-failed Auto Cherry-Picking Failed and removed auto-cherry-picking-failed Auto Cherry-Picking Failed needs-cherrypick labels May 28, 2024
@purajit purajit mentioned this pull request Jun 26, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@huonw huonw huonw approved these changes

Assignees

@cburroughs cburroughs

Labels
auto-cherry-picking-failed Auto Cherry-Picking Failed backend: Python Python backend-related issues category:internal CI, fixes for not-yet-released features, etc.
Projects
None yet
Milestone
2.19.x
Development

Successfully merging this pull request may close these issues.
4 participants
@cburroughs @WorkerPants @huonw @benjyw