Skip to content

Commit

Permalink
Regenerate all Python tool lock-files (updating many) and update to p…
Browse files Browse the repository at this point in the history
…ip_version = 24.0, for Py 3.12 support (#20365)

This does three things to fix #20354 and give Pants Python 3.12 support
by default:

- update the default `[python].pip_version` value to `24.0` (from
`23.1.2`), which is the current latest and is after 23.2, which is the
first that supports Python 3.12
- run `pants run build-support/bin/generate_builtin_lockfiles.py --
--all-python` to update all tool lockfiles... this involves updating
many tools, as a Big Bang, which is potentially unhelpful.
- to make this work, `docformatter` has to be restricted to the current
version 1.4: 1.5.1 (the newest version that satisfies the old
constraints) crashes on Pants itself
(PyCQA/docformatter#151), while 1.7.5 (the
newest version) also doesn't work on Pants (#20498)

Here's a list of (as best I can tell), the changes in versions for the
"main" requirement for each subsystem:

| subsystem options scope | main requirement | old version | new version |
|-------------------------|------------------|-------------|-------------|
| `helm-k8s-parser`       | `hikaru`         | 0.11.0b0    | 0.16.0b0    |
| `helm-post-renderer`    | `yamlpath`       | 3.7.0       | 3.8.1       |
| `autoflake`             | `autoflake`      | 2.0.1       | 2.1.1       |
| `bandit`                | `bandit`         | 1.7.4       | 1.7.5       |
| `black`                 | `black`          | 23.1.0      | 23.3.0      |
| `pyupgrade`             | `pyupgrade`      | 3.3.1       | 3.3.2       |
| `ruff`                  | `ruff`           | 0.2.1       | 0.2.2       |
| `yapf`                  | `yapf`           | 0.32.0      | 0.40.2      |
| `coverage-py`           | `coverage`       | 7.2.1       | 7.2.7       |
| `debugpy`               | `debugpy`        | 1.6.6       | 1.6.7.post1 |
| `mypy`                  | `mypy`           | 1.1.1       | 1.4.1       |
| `terraform-hcl2-parser` | `python-hcl2`    | 4.3.0       | 4.3.2       |
| `yamllint`              | `yamllint`       | 1.29.0      | 1.32.0      |

There's numerous other transitive dependencies updated too, including in
subsystems for which the main requirement hasn't changed and aren't
listed above.

I haven't checked changelogs for any of these.

I've confirmed that running the reproducer from #20354 with this code
now works. The commits are 'sensible'.
  • Loading branch information
huonw authored Feb 29, 2024
1 parent a67f30e commit 6bd4e8e
Show file tree
Hide file tree
Showing 33 changed files with 3,105 additions and 2,421 deletions.
8 changes: 5 additions & 3 deletions src/python/pants/backend/cc/lint/clangformat/clangformat.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// This lockfile was autogenerated by Pants. To regenerate, run:
//
// ./pants run build-support/bin/generate_builtin_lockfiles.py"
// ./pants run build-support/bin/generate_builtin_lockfiles.py
//
// --- BEGIN PANTS LOCKFILE METADATA: DO NOT EDIT OR REMOVE ---
// {
Expand Down Expand Up @@ -69,9 +69,11 @@
"platform_tag": null
}
],
"only_builds": [],
"only_wheels": [],
"path_mappings": {},
"pex_version": "2.1.126",
"pip_version": "23.0.1",
"pex_version": "2.2.1",
"pip_version": "24.0",
"prefer_older_binary": false,
"requirements": [
"clang-format<16,>=14.0.3"
Expand Down
338 changes: 205 additions & 133 deletions src/python/pants/backend/codegen/protobuf/python/grpclib.lock

Large diffs are not rendered by default.

46 changes: 24 additions & 22 deletions src/python/pants/backend/codegen/protobuf/python/mypy_protobuf.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// This lockfile was autogenerated by Pants. To regenerate, run:
//
// ./pants run build-support/bin/generate_builtin_lockfiles.py"
// ./pants run build-support/bin/generate_builtin_lockfiles.py
//
// --- BEGIN PANTS LOCKFILE METADATA: DO NOT EDIT OR REMOVE ---
// {
Expand All @@ -9,7 +9,7 @@
// "CPython<4,>=3.7"
// ],
// "generated_with_requirements": [
// "mypy-protobuf==3.4.0"
// "mypy-protobuf<4,>=3.4.0"
// ],
// "manylinux": "manylinux2014",
// "requirement_constraints": [],
Expand Down Expand Up @@ -52,63 +52,65 @@
"artifacts": [
{
"algorithm": "sha256",
"hash": "c3325803095fb4c2a48649c321d2fbde59f8fbfcb9bfc7a86df27d112831c571",
"url": "https://files.pythonhosted.org/packages/2b/ed/8f2113e3446bc98555cce3a17403180f86c70a51b9e61ef973e9c8df7179/protobuf-4.22.0-py3-none-any.whl"
"hash": "80797ce7424f8c8d2f2547e2d42bfbb6c08230ce5832d6c099a37335c9c90a92",
"url": "https://files.pythonhosted.org/packages/e5/a7/bb962b8b981dd890a44a34d0e922b76c32e5db443ff9f9b9ce6149069070/protobuf-4.24.4-py3-none-any.whl"
},
{
"algorithm": "sha256",
"hash": "e894e9ae603e963f0842498c4cd5d39c6a60f0d7e4c103df50ee939564298658",
"url": "https://files.pythonhosted.org/packages/1e/bf/54a989c36c1f2486d9b16f9ae423ca0060710a92408f1fed1a30c0368f85/protobuf-4.22.0-cp37-abi3-macosx_10_9_universal2.whl"
"hash": "5a70731910cd9104762161719c3d883c960151eea077134458503723b60e3667",
"url": "https://files.pythonhosted.org/packages/52/5c/f2c0778278259089952f94b0884ca27a001a17ffbd992ebe30c841085f4c/protobuf-4.24.4.tar.gz"
},
{
"algorithm": "sha256",
"hash": "7c535d126e7dcc714105ab20b418c4fedbd28f8b8afc42b7350b1e317bbbcc71",
"url": "https://files.pythonhosted.org/packages/7f/cf/7ae0168ab8b18b2ecbf5f1443d200c3ea5b71b9723443319abdde781335a/protobuf-4.22.0-cp37-abi3-manylinux2014_aarch64.whl"
"hash": "8e61a27f362369c2f33248a0ff6896c20dcd47b5d48239cb9720134bef6082e4",
"url": "https://files.pythonhosted.org/packages/88/12/efb5896c901382548ecb58d0449885a8f9aa62bb559d65e5a8a47f122629/protobuf-4.24.4-cp37-abi3-macosx_10_9_universal2.whl"
},
{
"algorithm": "sha256",
"hash": "86c3d20428b007537ba6792b475c0853bba7f66b1f60e610d913b77d94b486e4",
"url": "https://files.pythonhosted.org/packages/89/80/d5fc86e6d6761e353b67e616be29224c17a66064ffced0c6f2e3829e3dd8/protobuf-4.22.0-cp37-abi3-manylinux2014_x86_64.whl"
"hash": "b493cb590960ff863743b9ff1452c413c2ee12b782f48beca77c8da3e2ffe9d9",
"url": "https://files.pythonhosted.org/packages/c8/2c/03046cac73f46bfe98fc846ef629cf4f84c2f59258216aa2cc0d22bfca8f/protobuf-4.24.4-cp37-abi3-manylinux2014_x86_64.whl"
},
{
"algorithm": "sha256",
"hash": "652d8dfece122a24d98eebfef30e31e455d300efa41999d1182e015984ac5930",
"url": "https://files.pythonhosted.org/packages/f6/95/797a257a5db4a91dc2bc864c487ead56440014d741933a28c86d966b949e/protobuf-4.22.0.tar.gz"
"hash": "bffa46ad9612e6779d0e51ae586fde768339b791a50610d85eb162daeb23661e",
"url": "https://files.pythonhosted.org/packages/db/61/9c7b481771fe4702fb3be1152812fecec9b06f9c36d523ad52b98cb46800/protobuf-4.24.4-cp37-abi3-manylinux2014_aarch64.whl"
}
],
"project_name": "protobuf",
"requires_dists": [],
"requires_python": ">=3.7",
"version": "4.22.0"
"version": "4.24.4"
},
{
"artifacts": [
{
"algorithm": "sha256",
"hash": "1e59294618c9518f35f17ae1a3d866cdf7e998eb4b9907d41e9ebe5b84fde636",
"url": "https://files.pythonhosted.org/packages/91/f6/f73471cf2b6fc6deba2a18f78f3ff3f57a6c6e9fd515bef0591932c330e7/types_protobuf-4.22.0.0-py3-none-any.whl"
"hash": "131ab7d0cbc9e444bc89c994141327dcce7bcaeded72b1acb72a94827eb9c7af",
"url": "https://files.pythonhosted.org/packages/72/03/f7dd2f1ec9712c4242f04b7cb0f7e88605a98ee2695f0e98d72a277580aa/types_protobuf-4.24.0.4-py3-none-any.whl"
},
{
"algorithm": "sha256",
"hash": "bf2b414d815dc387c0a041d9207db054c7cdb94591bb233d9b71a85243e05efc",
"url": "https://files.pythonhosted.org/packages/25/c5/f1a63233ff535f83fa40f19454472612d34cedf486f1d264c8215bc020d0/types-protobuf-4.22.0.0.tar.gz"
"hash": "57ab42cb171dfdba2c74bb5b50c250478538cc3c5ed95b8b368929ad0c9f90a5",
"url": "https://files.pythonhosted.org/packages/99/a4/ab97dff4a76e30d33ccb42cb37912bf5ba63121466f579f5c7146a5e8eb0/types-protobuf-4.24.0.4.tar.gz"
}
],
"project_name": "types-protobuf",
"requires_dists": [],
"requires_python": null,
"version": "4.22.0.0"
"requires_python": ">=3.7",
"version": "4.24.0.4"
}
],
"platform_tag": null
}
],
"only_builds": [],
"only_wheels": [],
"path_mappings": {},
"pex_version": "2.1.126",
"pip_version": "23.0.1",
"pex_version": "2.2.1",
"pip_version": "24.0",
"prefer_older_binary": false,
"requirements": [
"mypy-protobuf==3.4.0"
"mypy-protobuf<4,>=3.4.0"
],
"requires_python": [
"<4,>=3.7"
Expand Down
12 changes: 7 additions & 5 deletions src/python/pants/backend/docker/subsystems/dockerfile.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// This lockfile was autogenerated by Pants. To regenerate, run:
//
// ./pants run build-support/bin/generate_builtin_lockfiles.py"
// ./pants run build-support/bin/generate_builtin_lockfiles.py
//
// --- BEGIN PANTS LOCKFILE METADATA: DO NOT EDIT OR REMOVE ---
// {
Expand All @@ -9,7 +9,7 @@
// "CPython<4,>=3.7"
// ],
// "generated_with_requirements": [
// "dockerfile==3.2.0"
// "dockerfile<4,>=3.2.0"
// ],
// "manylinux": "manylinux2014",
// "requirement_constraints": [],
Expand Down Expand Up @@ -59,12 +59,14 @@
"platform_tag": null
}
],
"only_builds": [],
"only_wheels": [],
"path_mappings": {},
"pex_version": "2.1.126",
"pip_version": "23.0.1",
"pex_version": "2.2.1",
"pip_version": "24.0",
"prefer_older_binary": false,
"requirements": [
"dockerfile==3.2.0"
"dockerfile<4,>=3.2.0"
],
"requires_python": [
"<4,>=3.7"
Expand Down
Loading

0 comments on commit 6bd4e8e

Please sign in to comment.