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 Pex to 2.1.162 #20496

Merged
merged 1 commit into from
Feb 6, 2024
Merged

upgrade Pex to 2.1.162 #20496

merged 1 commit into from
Feb 6, 2024

Conversation

cburroughs
Copy link
Contributor

Changelogs:

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

==                    Upgraded dependencies                     ==

  certifi                        2023.11.17   -->   2024.2.2
  cryptography                   41.0.7       -->   42.0.2
  pex                            2.1.159      -->   2.1.162
  pluggy                         1.3.0        -->   1.4.0
  pydantic                       1.10.13      -->   1.10.14
  python-dotenv                  1.0.0        -->   1.0.1
  urllib3                        2.1.0        -->   2.2.0

Further support relative to #15704
Fixes #20474

Changelogs:
 * https://github.com/pantsbuild/pex/releases/tag/v2.1.160
 * https://github.com/pantsbuild/pex/releases/tag/v2.1.161
 * https://github.com/pantsbuild/pex/releases/tag/v2.1.162

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

==                    Upgraded dependencies                     ==

  certifi                        2023.11.17   -->   2024.2.2
  cryptography                   41.0.7       -->   42.0.2
  pex                            2.1.159      -->   2.1.162
  pluggy                         1.3.0        -->   1.4.0
  pydantic                       1.10.13      -->   1.10.14
  python-dotenv                  1.0.0        -->   1.0.1
  urllib3                        2.1.0        -->   2.2.0
```

Further support relative to pantsbuild#15704
Fixes pantsbuild#20474
@cburroughs cburroughs self-assigned this Feb 6, 2024
@cburroughs cburroughs added category:new feature backend: Python Python backend-related issues category:bugfix Bug fixes for released features labels Feb 6, 2024
@huonw huonw merged commit 30058b7 into pantsbuild:main Feb 6, 2024
24 checks passed
@huonw huonw added this to the 2.19.x milestone Feb 6, 2024
@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-20496-to-2.19.x FETCH_HEAD \
      && git cherry-pick 30058b7cc99073a94eaf1a0eca88e85a7c59d0c4
  3. Fix the merge conflicts and commit the changes
  4. Run build-support/cherry_pick/make_pr.sh "20496" "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.


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 Feb 6, 2024
@huonw
Copy link
Contributor

huonw commented Feb 6, 2024

(I marked this for cherry picking based on the discussion in #20463.)

huonw added a commit that referenced this pull request Mar 7, 2024
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 <chris.burroughs@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
auto-cherry-picking-failed Auto Cherry-Picking Failed backend: Python Python backend-related issues category:bugfix Bug fixes for released features
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Pants 2.19 fails to download WHLs with URL-escaped chars
4 participants