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 (Cherry-pick of #20587, etc.) #20653

Merged
merged 1 commit into from
Mar 7, 2024
Merged

upgrade Pex to 2.2.1 (Cherry-pick of #20587, etc.) #20653

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
2 changes: 1 addition & 1 deletion 3rdparty/python/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ fasteners==0.16.3
freezegun==1.2.1
ijson==3.1.4
packaging==21.3
pex==2.1.148
pex==2.2.1
psutil==5.9.0
# This should be compatible with pytest.py, although it can be looser so that we don't
# over-constrain pantsbuild.pants.testutil
Expand Down
18 changes: 9 additions & 9 deletions 3rdparty/python/user_reqs.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
// "mypy-typing-asserts==0.1.1",
// "node-semver==0.9.0",
// "packaging==21.3",
// "pex==2.1.148",
// "pex==2.2.1",
// "psutil==5.9.0",
// "pydevd-pycharm==203.5419.8",
// "pytest<7.1.0,>=6.2.4",
Expand Down Expand Up @@ -909,21 +909,21 @@
"artifacts": [
{
"algorithm": "sha256",
"hash": "b406a54e66855c537182caf618ed2c9167b021ddc8f28a6d570af88cea691101",
"url": "https://files.pythonhosted.org/packages/08/35/3aa30be9d6be587e79d22a53a3d7fea24b4e1f677e9f68fa1042db6914e5/pex-2.1.148-py2.py3-none-any.whl"
"hash": "cde6756dc1ace8b4e0175afcd62da29f6635abe5516671717dffacb512502630",
"url": "https://files.pythonhosted.org/packages/05/fd/622e288459bb8ac3c294a7fefa251f0604390d65695f619b5012010aa96d/pex-2.2.1-py2.py3-none-any.whl"
},
{
"algorithm": "sha256",
"hash": "5d1111dbc39b23d4ec6798792e4017844c46abe738869a04ba7da16a09295179",
"url": "https://files.pythonhosted.org/packages/44/07/05627905adaafbfc4ae71f16fbc944849ba074fa74cda2c9fc93b887361c/pex-2.1.148.tar.gz"
"hash": "23adde5fd0439fd4468ad105662ba5b23118540b26632bd2362dfedad22b1aff",
"url": "https://files.pythonhosted.org/packages/32/81/caad3c5c9626ce1f9b8eb0d971d4c5553470aedeb04b8333a2a9c9d458f4/pex-2.2.1.tar.gz"
}
],
"project_name": "pex",
"requires_dists": [
"subprocess32>=3.2.7; extra == \"subprocess\" and python_version < \"3\""
],
"requires_python": "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,<3.13,>=2.7",
"version": "2.1.148"
"version": "2.2.1"
},
{
"artifacts": [
Expand Down Expand Up @@ -2216,8 +2216,8 @@
}
],
"path_mappings": {},
"pex_version": "2.1.148",
"pip_version": "23.2",
"pex_version": "2.2.1",
"pip_version": "24.0",
"prefer_older_binary": false,
"requirements": [
"PyGithub==2.0.0rc1",
Expand All @@ -2233,7 +2233,7 @@
"mypy-typing-asserts==0.1.1",
"node-semver==0.9.0",
"packaging==21.3",
"pex==2.1.148",
"pex==2.2.1",
"psutil==5.9.0",
"pydevd-pycharm==203.5419.8",
"pytest<7.1.0,>=6.2.4",
Expand Down
8 changes: 4 additions & 4 deletions src/python/pants/backend/python/util_rules/pex_cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ class PexCli(TemplatedExternalTool):
name = "pex"
help = "The PEX (Python EXecutable) tool (https://github.com/pantsbuild/pex)."

default_version = "v2.1.148"
default_url_template = "https://github.com/pantsbuild/pex/releases/download/{version}/pex"
default_version = "v2.2.1"
default_url_template = "https://github.com/pex-tool/pex/releases/download/{version}/pex"
version_constraints = ">=2.1.135,<3.0"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

NB. this leaves this at the same constraint it was in 2.19, which is different to what it was in #20587. In particular, #20481 and #20598 aren't cherry-picked.


@classproperty
Expand All @@ -46,8 +46,8 @@ def default_known_versions(cls):
(
cls.default_version,
plat,
"5b1dee5a89fff25747753e917f96b8707ea62eed404d037d5f8cf8f2e80a13b7",
"4197604",
"e38e7052282f1855606880333a8f8c8a09458fabc5b5e5fb6c48ce11a4564a34",
"4113219",
)
)
for plat in ["macos_arm64", "macos_x86_64", "linux_x86_64", "linux_arm64"]
Expand Down
Loading