Skip to content

Commit 8f29720

Browse files
grihaborhuonw
grihabor
and
huonw
authored
Upgrade external tools (#22065)
The pr was generated with this command: ``` pants run build-support/bin:external-tool-upgrade -- -v src/python/pants/backend/ ``` (Notes are not generated yet) The tool code is here #22064 --------- Co-authored-by: Huon Wilson <[email protected]>
1 parent c020a6c commit 8f29720

File tree

13 files changed

+136
-111
lines changed

13 files changed

+136
-111
lines changed

‎3rdparty/python/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ freezegun==1.2.1
1111
ijson==3.2.3
1212
libcst==1.4.0
1313
packaging==24.2
14-
pex==2.33.2
14+
pex==2.33.4
1515
psutil==5.9.8
1616
# This should be compatible with pytest.py, although it can be looser so that we don't
1717
# over-constrain pantsbuild.pants.testutil

‎3rdparty/python/user_reqs.lock

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
// "mypy-typing-asserts==0.1.1",
2424
// "node-semver==0.9.0",
2525
// "packaging==24.2",
26-
// "pex==2.33.2",
26+
// "pex==2.33.4",
2727
// "psutil==5.9.8",
2828
// "pydevd-pycharm==203.5419.8",
2929
// "pytest<7.1.0,>=6.2.4",
@@ -145,13 +145,13 @@
145145
"artifacts": [
146146
{
147147
"algorithm": "sha256",
148-
"hash": "c75a69e28a550a7e93789579c22aa26b0f5b83b75dc4e08fe092980051e1090a",
149-
"url": "https://files.pythonhosted.org/packages/fc/30/d4986a882011f9df997a55e6becd864812ccfcd821d64aac8570ee39f719/attrs-25.1.0-py3-none-any.whl"
148+
"hash": "611344ff0a5fed735d86d7784610c84f8126b95e549bcad9ff61b4242f2d386b",
149+
"url": "https://files.pythonhosted.org/packages/03/33/7a7388b9ef94aab40539939d94461ec682afbd895458945ed25be07f03f6/attrs-25.2.0-py3-none-any.whl"
150150
},
151151
{
152152
"algorithm": "sha256",
153-
"hash": "1c97078a80c814273a76b2a298a932eb681c87415c11dee0a6921de7f1b02c3e",
154-
"url": "https://files.pythonhosted.org/packages/49/7c/fdf464bcc51d23881d110abd74b512a42b3d5d376a55a831b44c603ae17f/attrs-25.1.0.tar.gz"
153+
"hash": "18a06db706db43ac232cce80443fcd9f2500702059ecf53489e3c5a3f417acaf",
154+
"url": "https://files.pythonhosted.org/packages/69/82/3c4e1d44f3cbaa2a578127d641fe385ba3bff6c38b789447ae11a21fa413/attrs-25.2.0.tar.gz"
155155
}
156156
],
157157
"project_name": "attrs",
@@ -195,10 +195,10 @@
195195
"sphinx-notfound-page; extra == \"docs\"",
196196
"sphinx; extra == \"docs\"",
197197
"sphinxcontrib-towncrier; extra == \"docs\"",
198-
"towncrier<24.7; extra == \"docs\""
198+
"towncrier; extra == \"docs\""
199199
],
200200
"requires_python": ">=3.8",
201-
"version": "25.1.0"
201+
"version": "25.2.0"
202202
},
203203
{
204204
"artifacts": [
@@ -1043,13 +1043,13 @@
10431043
"artifacts": [
10441044
{
10451045
"algorithm": "sha256",
1046-
"hash": "ab3a7ee9874285148a1b051d27f6a2087cf2a6a224ddf9478665f3965ed9dc73",
1047-
"url": "https://files.pythonhosted.org/packages/81/14/3ab42c736b4ff98db4046634241a3d3969f1230e698ecad99481bb29f631/pex-2.33.2-py2.py3-none-any.whl"
1046+
"hash": "74adabf5dbe24b47b10b1fdca9d814338339d76e5d536e3f68c18af773f90512",
1047+
"url": "https://files.pythonhosted.org/packages/21/66/be866dc522514830272e128aae0fec2a0a5e995ce75baa68acf248d8eed0/pex-2.33.4-py2.py3-none-any.whl"
10481048
},
10491049
{
10501050
"algorithm": "sha256",
1051-
"hash": "be487e93de6b68c6b40d27507d91db97657829b2d07bc30b2bf634c835b4a7a3",
1052-
"url": "https://files.pythonhosted.org/packages/d5/41/1c3d184ef3a5c395bc95db8a8a47b74fb09240d3338cff6d682658fc1bea/pex-2.33.2.tar.gz"
1051+
"hash": "ed1c80e2e0f3b075a42288bae79fe22dad517f5b5de11fbc118188e968313add",
1052+
"url": "https://files.pythonhosted.org/packages/ca/ea/85c749a5766881aa97e7c16ed22edeaf092ed0e86c3145f8ed0372f402c8/pex-2.33.4.tar.gz"
10531053
}
10541054
],
10551055
"project_name": "pex",
@@ -1058,7 +1058,7 @@
10581058
"subprocess32>=3.2.7; python_version < \"3\" and extra == \"subprocess\""
10591059
],
10601060
"requires_python": "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,<3.14,>=2.7",
1061-
"version": "2.33.2"
1061+
"version": "2.33.4"
10621062
},
10631063
{
10641064
"artifacts": [
@@ -2334,7 +2334,7 @@
23342334
"only_wheels": [],
23352335
"overridden": [],
23362336
"path_mappings": {},
2337-
"pex_version": "2.33.2",
2337+
"pex_version": "2.33.4",
23382338
"pip_version": "25.0.1",
23392339
"prefer_older_binary": false,
23402340
"requirements": [
@@ -2352,7 +2352,7 @@
23522352
"mypy-typing-asserts==0.1.1",
23532353
"node-semver==0.9.0",
23542354
"packaging==24.2",
2355-
"pex==2.33.2",
2355+
"pex==2.33.4",
23562356
"psutil==5.9.8",
23572357
"pydevd-pycharm==203.5419.8",
23582358
"pytest<7.1.0,>=6.2.4",

‎docs/notes/2.26.x.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,23 @@ Pants has a new mechanism for `@rule` invocation in backends. In this release th
5555
- [visibility](https://www.pantsbuild.org/stable/reference/subsystems/visibility)
5656
- [yapf](https://www.pantsbuild.org/stable/reference/subsystems/yapf)
5757

58+
#### Tool upgrades
59+
60+
The default versions of various external tools have been upgraded. The previous default versions are still supported, by pinning using the `version = "..."` field within the subsystem in `pants.toml`.
61+
62+
| Subsystem | Backend | Old version | New version |
63+
| ------------- | ------------------------------------------------------------------------ | ----------- | ----------- |
64+
| buildifier | `pants.backend.build_files.fmt.buildifier` | "7.1.2" | "8.0.3" |
65+
| golangci-lint | `pants.backend.experimental.go.lint.golangci_lint` | "1.51.1" | "1.64.6" |
66+
| helm-unittest | `pants.backend.experimental.helm` | "0.3.3" | "0.8.0" |
67+
| kubeconform | `pants.backend.experimental.helm.check.kubeconfirm` | "0.6.2" | "0.6.7" |
68+
| nfpm | `pants.backend.experimental.nfpm` | "2.38.0" | "2.41.3" |
69+
| pex-cli | `pants.backend.python` | "2.33.1" | "2.33.4" |
70+
| pyenv | `pants.backend.python.providers.experimental.pyenv` | "2.4.7" | "2.5.3" |
71+
| ruff | `pants.backend.experimental.python.lint.ruff.check` | "0.9.6" | "0.9.10" |
72+
| ruff | `pants.backend.experimental.python.lint.ruff.format` | "0.9.6" | "0.9.10" |
73+
| taplo | `pants.backend.tools.taplo` | "0.8.0" | "0.9.3" |
74+
5875
### Goals
5976

6077

‎src/python/pants/backend/build_files/fmt/buildifier/subsystem.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,16 @@ class Buildifier(TemplatedExternalTool):
2323
"""
2424
)
2525

26-
default_version = "7.1.2"
26+
default_version = "8.0.3"
2727
default_known_versions = [
28+
"8.0.3|macos_x86_64|b7a3152cde0b3971b1107f2274afe778c5c154dcdf6c9c669a231e3c004f047e|7772208",
29+
"8.0.3|macos_arm64|674c663f7b5cd03c002f8ca834a8c1c008ccb527a0a2a132d08a7a355883b22d|7717218",
30+
"8.0.3|linux_x86_64|c969487c1af85e708576c8dfdd0bb4681eae58aad79e68ae48882c70871841b7|7876618",
31+
"8.0.3|linux_arm64|bdd9b92e2c65d46affeecaefb54e68d34c272d1f4a8c5b54929a3e92ab78820a|7754590",
2832
"7.1.2|macos_x86_64|687c49c318fb655970cf716eed3c7bfc9caeea4f2931a2fd36593c458de0c537|7591232",
29-
"7.1.2|macos_arm64 |d0909b645496608fd6dfc67f95d9d3b01d90736d7b8c8ec41e802cb0b7ceae7c|7528994",
33+
"7.1.2|macos_arm64|d0909b645496608fd6dfc67f95d9d3b01d90736d7b8c8ec41e802cb0b7ceae7c|7528994",
3034
"7.1.2|linux_x86_64|28285fe7e39ed23dc1a3a525dfcdccbc96c0034ff1d4277905d2672a71b38f13|7702060",
31-
"7.1.2|linux_arm64 |c22a44eee37b8927167ee6ee67573303f4e31171e7ec3a8ea021a6a660040437|7568336",
35+
"7.1.2|linux_arm64|c22a44eee37b8927167ee6ee67573303f4e31171e7ec3a8ea021a6a660040437|7568336",
3236
]
3337
default_url_template = "https://github.com/bazelbuild/buildtools/releases/download/v{version}/buildifier-{platform}"
3438
default_url_platform_mapping = {

‎src/python/pants/backend/go/lint/golangci_lint/subsystem.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,16 @@ class GolangciLint(TemplatedExternalTool):
1515
name = "golangci-lint"
1616
help = "A fast Go linters runner"
1717

18-
default_version = "1.51.1"
18+
default_version = "1.64.6"
1919
default_known_versions = [
20-
"1.51.1|macos_arm64 |75b8f0ff3a4e68147156be4161a49d4576f1be37a0b506473f8c482140c1e7f2|9724049", # noqa: E501
21-
"1.51.1|macos_x86_64|fba08acc4027f69f07cef48fbff70b8a7ecdfaa1c2aba9ad3fb31d60d9f5d4bc|10054954", # noqa: E501
22-
"1.51.1|linux_arm64 |9744bc34e7b8d82ca788b667bfb7155a39b4be9aef43bf9f10318b1372cea338|8927955", # noqa: E501
23-
"1.51.1|linux_x86_64|17aeb26c76820c22efa0e1838b0ab93e90cfedef43fbfc9a2f33f27eb9e5e070|9712769", # noqa: E501
20+
"1.64.6|macos_x86_64|08f9459e7125fed2612abd71596e04d172695921aff82120d1c1e5e9b6fff2a3|12671159",
21+
"1.64.6|macos_arm64|8c10d0c7c3935b8c2269d628b6a06a8f48d8fb4cc31af02fe4ce0cd18b0704c1|11978218",
22+
"1.64.6|linux_x86_64|71e290acbacb7b3ba4f68f0540fb74dc180c4336ac8a6f3bdcd7fcc48b15148d|12365159",
23+
"1.64.6|linux_arm64|99a7ff13dec7a8781a68408b6ecb8a1c5e82786cba3189eaa91d5cdcc24362ce|11415605",
24+
"1.51.1|macos_x86_64|fba08acc4027f69f07cef48fbff70b8a7ecdfaa1c2aba9ad3fb31d60d9f5d4bc|10054954",
25+
"1.51.1|macos_arm64|75b8f0ff3a4e68147156be4161a49d4576f1be37a0b506473f8c482140c1e7f2|9724049",
26+
"1.51.1|linux_x86_64|17aeb26c76820c22efa0e1838b0ab93e90cfedef43fbfc9a2f33f27eb9e5e070|9712769",
27+
"1.51.1|linux_arm64|9744bc34e7b8d82ca788b667bfb7155a39b4be9aef43bf9f10318b1372cea338|8927955",
2428
]
2529
default_url_template = (
2630
"https://github.com/golangci/golangci-lint/releases/download/v{version}/"

‎src/python/pants/backend/helm/check/kubeconform/subsystem.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,17 @@ class KubeconformSubsystem(TemplatedExternalTool):
2525
name = "kubeconform"
2626
help = "Kubeconform tool (https://github.com/yannh/kubeconform)"
2727

28-
default_version = "0.6.2"
28+
default_version = "0.6.7"
2929
default_url_template = "https://github.com/yannh/kubeconform/releases/download/v{version}/kubeconform-{platform}.tar.gz"
3030
default_known_versions = [
31-
"0.6.2|linux_arm64 |41c15ecbb120042bee0aca8a616e479b555084d5d14bc2e095ed96081c1e9404|5335394",
32-
"0.6.2|linux_x86_64|d2a10db6b78d56de8fe9375b9c351bc573aa218a74da04d114767b505a675090|5739066",
33-
"0.6.2|macos_arm64 |881e3fe2ecdb1cc41bce80013113f24da80e1bec593876ffe88668333ae69b51|5423607",
31+
"0.6.7|macos_x86_64|3b5324ac4fd38ac60a49823b4051ff42ff7eb70144f1e9741fed1d14bc4fdb4e|6225509",
32+
"0.6.7|macos_arm64|cbb47d938a8d18eb5f79cb33663b2cecdee0c8ac0bf562ebcfca903df5f0802f|5907133",
33+
"0.6.7|linux_x86_64|95f14e87aa28c09d5941f11bd024c1d02fdc0303ccaa23f61cef67bc92619d73|6264184",
34+
"0.6.7|linux_arm64|dc82f79bb03c5479b1ae5fd4af221e4b5a3111f62bf01a2795d9c5c20fa96644|5841917",
3435
"0.6.2|macos_x86_64|88e53c2562482ed5ab7434188ca5ba03d3482088ac52d53da7499d579923f2e8|5656173",
36+
"0.6.2|macos_arm64|881e3fe2ecdb1cc41bce80013113f24da80e1bec593876ffe88668333ae69b51|5423607",
37+
"0.6.2|linux_x86_64|d2a10db6b78d56de8fe9375b9c351bc573aa218a74da04d114767b505a675090|5739066",
38+
"0.6.2|linux_arm64|41c15ecbb120042bee0aca8a616e479b555084d5d14bc2e095ed96081c1e9404|5335394",
3539
]
3640
default_url_platform_mapping = {
3741
"linux_arm64": "linux-arm64",

‎src/python/pants/backend/helm/subsystems/unittest.py

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,20 @@ class HelmUnitTestSubsystem(ExternalHelmPlugin):
2828
plugin_name = "unittest"
2929
help = "BDD styled unit test framework for Kubernetes Helm charts as a Helm plugin. (https://github.com/helm-unittest)"
3030

31-
default_version = "0.3.3"
31+
default_version = "0.8.0"
3232
default_known_versions = [
33-
"0.3.3|linux_x86_64|8ebe20f77012a5d4e7139760cabe36dd1ea38e40b26f57de3f4165d96bd486ff|21685365",
34-
"0.3.3|linux_arm64 |7f5e4426428cb9678f971576103df410e6fa38dd19b87fce4729f5217bd5c683|19944514",
33+
"0.8.0|macos_x86_64|4dfe519a0f0172e179f5a624f0a5fb20c3fa12737b182a1e244fda87e2dc2a7a|24199798",
34+
"0.8.0|macos_arm64|8275958346cc934c19b06bfc76f4a837ec7ab4c38f8cf8e980b7b93aa6b4d838|22776975",
35+
"0.8.0|linux_x86_64|3f436992adcc59a5e640d3d2889ccb275f22ad7cde8c8b8354b24728f4dd6f99|24293223",
36+
"0.8.0|linux_arm64|ca8be393510f4afad9ec64a6ba2666aae6333bd92169b249533aeaba440a61ec|22473391",
3537
"0.3.3|macos_x86_64|b2298a513b3cb6482ba2e42079c93ad18be8a31a230bd4dffdeb01ec2881d0f5|21497144",
36-
"0.3.3|macos_arm64 |2365f5b3a99e6fc83218457046378b14039a3992e9ae96a4192bc2e43a33c742|20479438",
37-
"0.2.8|linux_x86_64|d7c452559ad4406a1197435394fbcffe51198060de1aa9b4cb6feaf876776ba0|18299096",
38-
"0.2.8|linux_arm64 |c793e241b063f0540ad9b4acc0a02e5a101bd9daea5bdf4d8562e9b2337fedb2|16943867",
38+
"0.3.3|macos_arm64|2365f5b3a99e6fc83218457046378b14039a3992e9ae96a4192bc2e43a33c742|20479438",
39+
"0.3.3|linux_x86_64|8ebe20f77012a5d4e7139760cabe36dd1ea38e40b26f57de3f4165d96bd486ff|21685365",
40+
"0.3.3|linux_arm64|7f5e4426428cb9678f971576103df410e6fa38dd19b87fce4729f5217bd5c683|19944514",
3941
"0.2.8|macos_x86_64|1dc95699320894bdebf055c4f4cc084c2cfa0133d3cb7fd6a4c0adca94df5c96|18161928",
40-
"0.2.8|macos_arm64 |436e3167c26f71258b96e32c2877b4f97c051064db941de097cf3db2fc861342|17621648",
42+
"0.2.8|macos_arm64|436e3167c26f71258b96e32c2877b4f97c051064db941de097cf3db2fc861342|17621648",
43+
"0.2.8|linux_x86_64|d7c452559ad4406a1197435394fbcffe51198060de1aa9b4cb6feaf876776ba0|18299096",
44+
"0.2.8|linux_arm64|c793e241b063f0540ad9b4acc0a02e5a101bd9daea5bdf4d8562e9b2337fedb2|16943867",
4145
]
4246
default_url_template = "https://github.com/helm-unittest/helm-unittest/releases/download/v{version}/helm-unittest-{platform}-{version}.tgz"
4347
default_url_platform_mapping = {

‎src/python/pants/backend/makeself/subsystem.py

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
from pants.engine.rules import Rule, collect_rules, implicitly, rule
2121
from pants.engine.unions import UnionRule
2222
from pants.util.logging import LogLevel
23-
from pants.util.meta import classproperty
2423

2524
logger = logging.getLogger(__name__)
2625

@@ -30,21 +29,12 @@ class MakeselfSubsystem(TemplatedExternalTool):
3029
help = "A tool to generate a self-extractable compressed tar archives."
3130

3231
default_version = "2.5.0"
33-
34-
@classproperty
35-
def default_known_versions(cls):
36-
return [
37-
"|".join(
38-
(
39-
cls.default_version,
40-
platform,
41-
"4d2fa9d898be22c63bb3c6bb7cc3dc97237700dea6d6ad898dcbec0289df0bc4",
42-
"45867",
43-
)
44-
)
45-
for platform in ["macos_arm64", "macos_x86_64", "linux_arm64", "linux_x86_64"]
46-
]
47-
32+
default_known_versions = [
33+
"2.5.0|macos_arm64|4d2fa9d898be22c63bb3c6bb7cc3dc97237700dea6d6ad898dcbec0289df0bc4|45867",
34+
"2.5.0|macos_x86_64|4d2fa9d898be22c63bb3c6bb7cc3dc97237700dea6d6ad898dcbec0289df0bc4|45867",
35+
"2.5.0|linux_arm64|4d2fa9d898be22c63bb3c6bb7cc3dc97237700dea6d6ad898dcbec0289df0bc4|45867",
36+
"2.5.0|linux_x86_64|4d2fa9d898be22c63bb3c6bb7cc3dc97237700dea6d6ad898dcbec0289df0bc4|45867",
37+
]
4838
default_url_template = "https://github.com/megastep/makeself/releases/download/release-{version}/makeself-{version}.run"
4939

5040

‎src/python/pants/backend/nfpm/subsystem.py

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,21 @@ class NfpmSubsystem(TemplatedExternalTool):
2727
help = "The nFPM deb, rpm, apk, and archlinux packager (https://nfpm.goreleaser.com)."
2828

2929
# The version WITHOUT the 'v' prefix which we add as needed in the url_template.
30-
default_version = "2.38.0" # released 05 July 2024
30+
default_version = "2.41.3"
3131
# v2.35.0 added SOURCE_DATE_EPOCH support
3232
# v2.36.0 added rpm.scripts.verify
3333
# v2.37.0 added support for IPK packaging (TODO: add IPK package target+fields+rules)
3434
default_known_versions = [
35-
# checksums from https://github.com/goreleaser/nfpm/releases/download/v2.38.0/checksums.txt
36-
"2.38.0|linux_arm64 |e63be8d586d7c8f6af06945956aa29fb88388caa19d7c5b652f41ae37a155b27|4780662",
37-
"2.38.0|linux_x86_64|d9eebe93ee2832cfc8435b3f79ee92a845f1e5fbb99db5a3777a0013e175170d|5196368",
38-
"2.38.0|macos_arm64 |48788831696cf056b1a0f9f52e187dbb65c191f5488962696ab3b98fff9f7821|4978997",
35+
"2.41.3|macos_x86_64|ad200ce58db4a980b79a6cf182ae69e4b3ffc6f30af722396ba4dadaa54a535e|5735548",
36+
"2.41.3|macos_arm64|8f053cb9e01ffaa32b929dbf73d34f0a81d135044751f8d4138a418064ee5ae5|5370742",
37+
"2.41.3|linux_x86_64|22aa6d3bc2ec239d62d3d190bcb036a47f2b24e0c3c6edfccebb6a55fbb2078e|5642686",
38+
"2.41.3|linux_arm64|f20852f79109c8a77cb19150d26fc5c5a0d3bbde33bf46a76341e434ea411225|5174782",
39+
"2.38.0|win_x86_64|3124f9bb838410ef98eebfed2267670790ce6bb262ae2a6ca1938a69e087593b|5389117",
40+
"2.38.0|win_arm64|1a9c7fcd50eb105231f6f6f6cb90d7cdf50e6c34665eb6e881a185387ad158b1|4888861",
3941
"2.38.0|macos_x86_64|781420f18ed6bd84a437fe3b272c1b1a03bad546aaaf4f7251b21c25a24ce32b|5294310",
40-
"2.38.0|win_arm64 |1a9c7fcd50eb105231f6f6f6cb90d7cdf50e6c34665eb6e881a185387ad158b1|4888861",
41-
"2.38.0|win_x86_64 |3124f9bb838410ef98eebfed2267670790ce6bb262ae2a6ca1938a69e087593b|5389117",
42+
"2.38.0|macos_arm64|48788831696cf056b1a0f9f52e187dbb65c191f5488962696ab3b98fff9f7821|4978997",
43+
"2.38.0|linux_x86_64|d9eebe93ee2832cfc8435b3f79ee92a845f1e5fbb99db5a3777a0013e175170d|5196368",
44+
"2.38.0|linux_arm64|e63be8d586d7c8f6af06945956aa29fb88388caa19d7c5b652f41ae37a155b27|4780662",
4245
]
4346

4447
default_url_template = (

0 commit comments

Comments
 (0)