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.1.93. #15911

Closed
wants to merge 1 commit into from
Closed

Upgrade Pex to 2.1.93. #15911

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.
Jump to
Jump to file
Failed to load files.
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 @@ -15,7 +15,7 @@ humbug==0.2.7

ijson==3.1.4
packaging==21.3
pex==2.1.90
pex==2.1.93
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
75 changes: 34 additions & 41 deletions 3rdparty/python/user_reqs.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
// "ijson==3.1.4",
// "mypy-typing-asserts==0.1.1",
// "packaging==21.3",
// "pex==2.1.90",
// "pex==2.1.93",
// "psutil==5.9.0",
// "pydevd-pycharm==203.5419.8",
// "pytest<7.1.0,>=6.2.4",
Expand Down Expand Up @@ -203,39 +203,39 @@
"artifacts": [
{
"algorithm": "sha256",
"hash": "687b5fe14be40aadcf547cae91337a1fdb84026046a39370274e54d3fe4fb4f9",
"url": "https://files.pythonhosted.org/packages/d8/32/77a2792d80c00083626e0d6ce41ba8254b632c960235d3a5a731c185d936/backports.cached_property-1.0.1-py3-none-any.whl"
"hash": "baeb28e1cd619a3c9ab8941431fe34e8490861fb998c6c4590693d50171db0cc",
"url": "https://files.pythonhosted.org/packages/eb/ae/69e52acdcf381b108b36d989ea58656de4a9ab8863aba6176d80d01041df/backports.cached_property-1.0.2-py3-none-any.whl"
},
{
"algorithm": "sha256",
"hash": "1a5ef1e750f8bc7d0204c807aae8e0f450c655be0cf4b30407a35fd4bb27186c",
"url": "https://files.pythonhosted.org/packages/4f/d8/fd7b8e24a207023e39b9c0cd607a9b3ba757552ec0d81b4328183961af2e/backports.cached-property-1.0.1.tar.gz"
"hash": "9306f9eed6ec55fd156ace6bc1094e2c86fae5fb2bf07b6a9c00745c656e75dd",
"url": "https://files.pythonhosted.org/packages/08/83/4cea5c665d2af765c02f7d8e8560b5918405c1d7d11ccfc60c4919c1cfd0/backports.cached-property-1.0.2.tar.gz"
}
],
"project_name": "backports-cached-property",
"requires_dists": [
"typing>=3.6; python_version < \"3.7\""
],
"requires_python": ">=3.6.0",
"version": "1.0.1"
"version": "1.0.2"
},
{
"artifacts": [
{
"algorithm": "sha256",
"hash": "f1d53542ee8cbedbe2118b5686372fb33c297fcd6379b050cca0ef13a597382a",
"url": "https://files.pythonhosted.org/packages/11/dd/e015f3780f42dd9af62cf0107b44ea1298926627ecd70c17b0e484e95bcd/certifi-2022.5.18.1-py3-none-any.whl"
"hash": "fe86415d55e84719d75f8b69414f6438ac3547d2078ab91b67e779ef69378412",
"url": "https://files.pythonhosted.org/packages/e9/06/d3d367b7af6305b16f0d28ae2aaeb86154fa91f144f036c2d5002a5a202b/certifi-2022.6.15-py3-none-any.whl"
},
{
"algorithm": "sha256",
"hash": "9c5705e395cd70084351dd8ad5c41e65655e08ce46f2ec9cf6c2c08390f71eb7",
"url": "https://files.pythonhosted.org/packages/07/10/75277f313d13a2b74fc56e29239d5c840c2bf09f17bf25c02b35558812c6/certifi-2022.5.18.1.tar.gz"
"hash": "84c85a9078b11105f04f3036a9482ae10e4621616db313fe045dd24743a0820d",
"url": "https://files.pythonhosted.org/packages/cc/85/319a8a684e8ac6d87a1193090e06b6bbb302717496380e225ee10487c888/certifi-2022.6.15.tar.gz"
}
],
"project_name": "certifi",
"requires_dists": [],
"requires_python": ">=3.6",
"version": "2022.5.18.1"
"version": "2022.6.15"
},
{
"artifacts": [
Expand Down Expand Up @@ -300,19 +300,19 @@
"artifacts": [
{
"algorithm": "sha256",
"hash": "9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2",
"url": "https://files.pythonhosted.org/packages/44/98/5b86278fbbf250d239ae0ecb724f8572af1c91f4a11edf4d36a206189440/colorama-0.4.4-py2.py3-none-any.whl"
"hash": "854bf444933e37f5824ae7bfc1e98d5bce2ebe4160d46b5edf346a89358e99da",
"url": "https://files.pythonhosted.org/packages/77/8b/7550e87b2d308a1b711725dfaddc19c695f8c5fa413c640b2be01662f4e6/colorama-0.4.5-py2.py3-none-any.whl"
},
{
"algorithm": "sha256",
"hash": "5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b",
"url": "https://files.pythonhosted.org/packages/1f/bb/5d3246097ab77fa083a61bd8d3d527b7ae063c7d8e8671b1cf8c4ec10cbe/colorama-0.4.4.tar.gz"
"hash": "e6c6b4334fc50988a639d9b98aa429a0b57da6e17b9a44f0451f930b6967b7a4",
"url": "https://files.pythonhosted.org/packages/2b/65/24d033a9325ce42ccbfa3ca2d0866c7e89cc68e5b9d92ecaba9feef631df/colorama-0.4.5.tar.gz"
}
],
"project_name": "colorama",
"requires_dists": [],
"requires_python": "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7",
"version": "0.4.4"
"version": "0.4.5"
},
{
"artifacts": [
Expand Down Expand Up @@ -869,21 +869,21 @@
"artifacts": [
{
"algorithm": "sha256",
"hash": "a1c00bb8ca43a44a76ed2b3c6b9acfd2804630d704c788e41474843d6250fb83",
"url": "https://files.pythonhosted.org/packages/b6/3b/95bfd873b10b15fb5ea5bcdad444803d4af4d2e3c967ab47d8adbd5c7730/pex-2.1.90-py2.py3-none-any.whl"
"hash": "e20143efdab8591a271def3f35909036c313968a267e57c94f582b911bbaf315",
"url": "https://files.pythonhosted.org/packages/ff/36/2aa66178bd3d90ce3000fedf4047ea94e6ed08e014522d1cec3cda381c85/pex-2.1.93-py2.py3-none-any.whl"
},
{
"algorithm": "sha256",
"hash": "17d929929d59ef44d666383ded7d191cca269acc23d3bb09c505e22953cc9d15",
"url": "https://files.pythonhosted.org/packages/2b/8e/da8f418efa126a862c3165458777dec24995615f0a1b65c3f7caec1123d8/pex-2.1.90.tar.gz"
"hash": "eda5e929b1a326b90c4ba97607a8d1d575a7eeddd62f2ced78f13231068991b9",
"url": "https://files.pythonhosted.org/packages/70/92/05bff054a7de66a778df09042df7cd290c68ca8660a0ff9dfaefb4c4e626/pex-2.1.93.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.12,>=2.7",
"version": "2.1.90"
"version": "2.1.93"
},
{
"artifacts": [
Expand Down Expand Up @@ -1425,29 +1425,26 @@
"artifacts": [
{
"algorithm": "sha256",
"hash": "f22fa1e554c9ddfd16e6e41ac79759e17be9e492b3587efa038054674760e72d",
"url": "https://files.pythonhosted.org/packages/2d/61/08076519c80041bc0ffa1a8af0cbd3bf3e2b62af10435d269a9d0f40564d/requests-2.27.1-py2.py3-none-any.whl"
"hash": "bc7861137fbce630f17b03d3ad02ad0bf978c844f3536d0edda6499dafce2b6f",
"url": "https://files.pythonhosted.org/packages/41/5b/2209eba8133fc081d3ffff02e1f6376e3117e52bb16f674721a83e67e68e/requests-2.28.0-py3-none-any.whl"
},
{
"algorithm": "sha256",
"hash": "68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61",
"url": "https://files.pythonhosted.org/packages/60/f3/26ff3767f099b73e0efa138a9998da67890793bfa475d8278f84a30fec77/requests-2.27.1.tar.gz"
"hash": "d568723a7ebd25875d8d1eaf5dfa068cd2fc8194b2e483d7b1f7c81918dbec6b",
"url": "https://files.pythonhosted.org/packages/e9/23/384d9953bb968731212dc37af87cb75a885dc48e0615bd6a303577c4dc4b/requests-2.28.0.tar.gz"
}
],
"project_name": "requests",
"requires_dists": [
"PySocks!=1.5.7,>=1.5.6; extra == \"socks\"",
"certifi>=2017.4.17",
"chardet<5,>=3.0.2; extra == \"use_chardet_on_py3\"",
"chardet<5,>=3.0.2; python_version < \"3\"",
"charset-normalizer~=2.0.0; python_version >= \"3\"",
"idna<3,>=2.5; python_version < \"3\"",
"idna<4,>=2.5; python_version >= \"3\"",
"urllib3<1.27,>=1.21.1",
"win-inet-pton; (sys_platform == \"win32\" and python_version == \"2.7\") and extra == \"socks\""
],
"requires_python": "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,>=2.7",
"version": "2.27.1"
"charset-normalizer~=2.0.0",
"idna<4,>=2.5",
"urllib3<1.27,>=1.21.1"
],
"requires_python": "<4,>=3.7",
"version": "2.28"
},
{
"artifacts": [
Expand Down Expand Up @@ -2451,15 +2448,11 @@
"version": "3.8"
}
],
"platform_tag": [
"cp38",
"cp38",
"macosx_12_0_x86_64"
]
"platform_tag": null
}
],
"path_mappings": {},
"pex_version": "2.1.90",
"pex_version": "2.1.93",
"prefer_older_binary": false,
"requirements": [
"PyYAML<7.0,>=6.0",
Expand All @@ -2472,7 +2465,7 @@
"ijson==3.1.4",
"mypy-typing-asserts==0.1.1",
"packaging==21.3",
"pex==2.1.90",
"pex==2.1.93",
"psutil==5.9.0",
"pydevd-pycharm==203.5419.8",
"pytest<7.1.0,>=6.2.4",
Expand Down
19 changes: 10 additions & 9 deletions src/python/pants/backend/python/subsystems/lambdex.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,27 +49,28 @@
"artifacts": [
{
"algorithm": "sha256",
"hash": "a1c00bb8ca43a44a76ed2b3c6b9acfd2804630d704c788e41474843d6250fb83",
"url": "https://files.pythonhosted.org/packages/b6/3b/95bfd873b10b15fb5ea5bcdad444803d4af4d2e3c967ab47d8adbd5c7730/pex-2.1.90-py2.py3-none-any.whl"
"hash": "e20143efdab8591a271def3f35909036c313968a267e57c94f582b911bbaf315",
"url": "https://files.pythonhosted.org/packages/ff/36/2aa66178bd3d90ce3000fedf4047ea94e6ed08e014522d1cec3cda381c85/pex-2.1.93-py2.py3-none-any.whl"
},
{
"algorithm": "sha256",
"hash": "eda5e929b1a326b90c4ba97607a8d1d575a7eeddd62f2ced78f13231068991b9",
"url": "https://files.pythonhosted.org/packages/70/92/05bff054a7de66a778df09042df7cd290c68ca8660a0ff9dfaefb4c4e626/pex-2.1.93.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.12,>=2.7",
"version": "2.1.90"
"version": "2.1.93"
}
],
"platform_tag": [
"cp37",
"cp37m",
"manylinux_2_35_x86_64"
]
"platform_tag": null
}
],
"path_mappings": {},
"pex_version": "2.1.90",
"pex_version": "2.1.93",
"prefer_older_binary": false,
"requirements": [
"lambdex==0.1.6"
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 @@ -39,9 +39,9 @@ class PexCli(TemplatedExternalTool):
name = "pex"
help = "The PEX (Python EXecutable) tool (https://github.com/pantsbuild/pex)."

default_version = "v2.1.90"
default_version = "v2.1.93"
default_url_template = "https://github.com/pantsbuild/pex/releases/download/{version}/pex"
version_constraints = ">=2.1.90,<3.0"
version_constraints = ">=2.1.93,<3.0"

@classproperty
def default_known_versions(cls):
Expand All @@ -50,8 +50,8 @@ def default_known_versions(cls):
(
cls.default_version,
plat,
"2781255baf77c2a8fdc85c5e830f7191a6048fd91d2e20b5c7a20e5a0b7beb66",
"3755345",
"80fc6b94f5db253a71061974cb8d8ce520932aef44d989e9057917cc33a30fd6",
"3802280",
)
)
for plat in ["macos_arm64", "macos_x86_64", "linux_x86_64", "linux_arm64"]
Expand Down