Skip to content

Commit 48807e7

Browse files
benjywbenjyw
authored
Upgrade to Pants 2.12.0 and protobuf 3.20.1 (#16)
Pants 2.12.0 uses 3.20.1 as the default protoc, and it is not compatible with earlier protobuf runtime.
1 parent 7cc88c4 commit 48807e7

3 files changed

Lines changed: 180 additions & 50 deletions

File tree

‎3rdparty/python/default.lock‎

Lines changed: 178 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,179 @@
1-
# This lockfile was autogenerated by Pants. To regenerate, run:
2-
#
3-
# ./pants generate-lockfiles --resolve=python-default
4-
#
5-
# --- BEGIN PANTS LOCKFILE METADATA: DO NOT EDIT OR REMOVE ---
6-
# {
7-
# "version": 2,
8-
# "valid_for_interpreter_constraints": [
9-
# "CPython<3.11,>=3.8"
10-
# ],
11-
# "generated_with_requirements": [
12-
# "protobuf>=3.19.0",
13-
# "thrift==0.15.0"
14-
# ]
15-
# }
16-
# --- END PANTS LOCKFILE METADATA ---
1+
// This lockfile was autogenerated by Pants. To regenerate, run:
2+
//
3+
// ./pants generate-lockfiles --resolve=python-default
4+
//
5+
// --- BEGIN PANTS LOCKFILE METADATA: DO NOT EDIT OR REMOVE ---
6+
// {
7+
// "version": 2,
8+
// "valid_for_interpreter_constraints": [
9+
// "CPython<3.11,>=3.8"
10+
// ],
11+
// "generated_with_requirements": [
12+
// "protobuf==3.20.1",
13+
// "thrift==0.15.0"
14+
// ]
15+
// }
16+
// --- END PANTS LOCKFILE METADATA ---
1717

18-
protobuf==3.19.4; python_version >= "3.5" \
19-
--hash=sha256:f51d5a9f137f7a2cec2d326a74b6e3fc79d635d69ffe1b036d39fc7d75430d37 \
20-
--hash=sha256:09297b7972da685ce269ec52af761743714996b4381c085205914c41fcab59fb \
21-
--hash=sha256:072fbc78d705d3edc7ccac58a62c4c8e0cec856987da7df8aca86e647be4e35c \
22-
--hash=sha256:7bb03bc2873a2842e5ebb4801f5c7ff1bfbdf426f85d0172f7644fcda0671ae0 \
23-
--hash=sha256:f358aa33e03b7a84e0d91270a4d4d8f5df6921abe99a377828839e8ed0c04e07 \
24-
--hash=sha256:1c91ef4110fdd2c590effb5dca8fdbdcb3bf563eece99287019c4204f53d81a4 \
25-
--hash=sha256:c438268eebb8cf039552897d78f402d734a404f1360592fef55297285f7f953f \
26-
--hash=sha256:835a9c949dc193953c319603b2961c5c8f4327957fe23d914ca80d982665e8ee \
27-
--hash=sha256:4276cdec4447bd5015453e41bdc0c0c1234eda08420b7c9a18b8d647add51e4b \
28-
--hash=sha256:6cbc312be5e71869d9d5ea25147cdf652a6781cf4d906497ca7690b7b9b5df13 \
29-
--hash=sha256:54a1473077f3b616779ce31f477351a45b4fef8c9fd7892d6d87e287a38df368 \
30-
--hash=sha256:435bb78b37fc386f9275a7035fe4fb1364484e38980d0dd91bc834a02c5ec909 \
31-
--hash=sha256:16f519de1313f1b7139ad70772e7db515b1420d208cb16c6d7858ea989fc64a9 \
32-
--hash=sha256:cdc076c03381f5c1d9bb1abdcc5503d9ca8b53cf0a9d31a9f6754ec9e6c8af0f \
33-
--hash=sha256:69da7d39e39942bd52848438462674c463e23963a1fdaa84d88df7fbd7e749b2 \
34-
--hash=sha256:48ed3877fa43e22bcacc852ca76d4775741f9709dd9575881a373bd3e85e54b2 \
35-
--hash=sha256:bd95d1dfb9c4f4563e6093a9aa19d9c186bf98fa54da5252531cc0d3a07977e7 \
36-
--hash=sha256:b38057450a0c566cbd04890a40edf916db890f2818e8682221611d78dc32ae26 \
37-
--hash=sha256:7ca7da9c339ca8890d66958f5462beabd611eca6c958691a8fe6eccbd1eb0c6e \
38-
--hash=sha256:36cecbabbda242915529b8ff364f2263cd4de7c46bbe361418b5ed859677ba58 \
39-
--hash=sha256:c1068287025f8ea025103e37d62ffd63fec8e9e636246b89c341aeda8a67c934 \
40-
--hash=sha256:96bd766831596d6014ca88d86dc8fe0fb2e428c0b02432fd9db3943202bf8c5e \
41-
--hash=sha256:84123274d982b9e248a143dadd1b9815049f4477dc783bf84efe6250eb4b836a \
42-
--hash=sha256:3112b58aac3bac9c8be2b60a9daf6b558ca3f7681c130dcdd788ade7c9ffbdca \
43-
--hash=sha256:8961c3a78ebfcd000920c9060a262f082f29838682b1f7201889300c1fbe0616 \
44-
--hash=sha256:9df0c10adf3e83015ced42a9a7bd64e13d06c4cf45c340d2c63020ea04499d0a
45-
six==1.16.0; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.3.0" \
46-
--hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254 \
47-
--hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926
48-
thrift==0.15.0 \
49-
--hash=sha256:87c8205a71cf8bbb111cb99b1f7495070fbc9cabb671669568854210da5b3e29
18+
{
19+
"allow_builds": true,
20+
"allow_prereleases": false,
21+
"allow_wheels": true,
22+
"build_isolation": true,
23+
"constraints": [],
24+
"locked_resolves": [
25+
{
26+
"locked_requirements": [
27+
{
28+
"artifacts": [
29+
{
30+
"algorithm": "sha256",
31+
"hash": "adfc6cf69c7f8c50fd24c793964eef18f0ac321315439d94945820612849c388",
32+
"url": "https://files.pythonhosted.org/packages/ef/c8/2e7f7feaf804b7206e6cc8fa3f0f49834a78f7cb127813d2c45e42d5f7bf/protobuf-3.20.1-py2.py3-none-any.whl"
33+
},
34+
{
35+
"algorithm": "sha256",
36+
"hash": "7e371f10abe57cee5021797126c93479f59fccc9693dafd6bd5633ab67808a91",
37+
"url": "https://files.pythonhosted.org/packages/00/f6/061b2d6ae57c458dbd37df4edb667872f65001a124a7023cd7bced76c09a/protobuf-3.20.1-cp39-cp39-win_amd64.whl"
38+
},
39+
{
40+
"algorithm": "sha256",
41+
"hash": "6f50601512a3d23625d8a85b1638d914a0970f17920ff39cec63aaef80a93fb7",
42+
"url": "https://files.pythonhosted.org/packages/0b/db/2b07ad1542511b0b2b2c1796c316c5063f9724b86240f5e6accc1fde5e5f/protobuf-3.20.1-cp39-cp39-macosx_10_9_x86_64.whl"
43+
},
44+
{
45+
"algorithm": "sha256",
46+
"hash": "adc31566d027f45efe3f44eeb5b1f329da43891634d61c75a5944e9be6dd42c9",
47+
"url": "https://files.pythonhosted.org/packages/19/96/1283259c25bc48a6df98fa096f66fc568b40137b93806ef5ff66a2d166b1/protobuf-3.20.1.tar.gz"
48+
},
49+
{
50+
"algorithm": "sha256",
51+
"hash": "dd5789b2948ca702c17027c84c2accb552fc30f4622a98ab5c51fcfe8c50d3e7",
52+
"url": "https://files.pythonhosted.org/packages/3c/59/b0ac614cdb5e73d3a7171e3de8d9cf933cc76068305b13ac9351c9985835/protobuf-3.20.1-cp38-cp38-win32.whl"
53+
},
54+
{
55+
"algorithm": "sha256",
56+
"hash": "cd68be2559e2a3b84f517fb029ee611546f7812b1fdd0aa2ecc9bc6ec0e4fdde",
57+
"url": "https://files.pythonhosted.org/packages/4c/be/bdd22d86d24e5b8b08673d80be70d1a72c255f85152ff09b28490904092a/protobuf-3.20.1-cp310-cp310-manylinux_2_12_x86_64.manylinux2010_x86_64.whl"
58+
},
59+
{
60+
"algorithm": "sha256",
61+
"hash": "ff8d8fa42675249bb456f5db06c00de6c2f4c27a065955917b28c4f15978b9c3",
62+
"url": "https://files.pythonhosted.org/packages/70/75/df318e565cf126a9464b9220ef6adfecb44fb7c68df140bc5680d0ed05c3/protobuf-3.20.1-cp310-cp310-manylinux2014_aarch64.whl"
63+
},
64+
{
65+
"algorithm": "sha256",
66+
"hash": "cb29edb9eab15742d791e1025dd7b6a8f6fcb53802ad2f6e3adcb102051063ab",
67+
"url": "https://files.pythonhosted.org/packages/7b/4b/12c4959e2065a567acb6c632cfbf97cd12e0e5a48d3d267cb034249588bb/protobuf-3.20.1-cp38-cp38-manylinux2014_aarch64.whl"
68+
},
69+
{
70+
"algorithm": "sha256",
71+
"hash": "9016d01c91e8e625141d24ec1b20fed584703e527d28512aa8c8707f105a683c",
72+
"url": "https://files.pythonhosted.org/packages/89/1a/b4d72e1d7134ffac2156d1dfc3b9ddb21d1664ff392e1e5fe2882a117f81/protobuf-3.20.1-cp310-cp310-win32.whl"
73+
},
74+
{
75+
"algorithm": "sha256",
76+
"hash": "db977c4ca738dd9ce508557d4fce0f5aebd105e158c725beec86feb1f6bc20d8",
77+
"url": "https://files.pythonhosted.org/packages/8f/cd/d2a90e55397acae08363e26db3a1bbd6674c16a891ab8ee033b44e59af09/protobuf-3.20.1-cp39-cp39-win32.whl"
78+
},
79+
{
80+
"algorithm": "sha256",
81+
"hash": "7403941f6d0992d40161aa8bb23e12575637008a5a02283a930addc0508982f9",
82+
"url": "https://files.pythonhosted.org/packages/98/d9/63b47f719d3cc0f29b36e870ad1d9447b8eef398c2a7b548e67298d9f652/protobuf-3.20.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl"
83+
},
84+
{
85+
"algorithm": "sha256",
86+
"hash": "284f86a6207c897542d7e956eb243a36bb8f9564c1742b253462386e96c6b78f",
87+
"url": "https://files.pythonhosted.org/packages/9f/b0/bf25cdbab8841d9111f0f13578150d232339a6483383589648592fe84f4b/protobuf-3.20.1-cp39-cp39-manylinux2014_aarch64.whl"
88+
},
89+
{
90+
"algorithm": "sha256",
91+
"hash": "3cc797c9d15d7689ed507b165cd05913acb992d78b379f6014e013f9ecb20996",
92+
"url": "https://files.pythonhosted.org/packages/bd/ca/0d522203bedd17a8c53cb869e1dfd7ac9140c66b76b3cbca25bf601448b2/protobuf-3.20.1-cp310-cp310-macosx_10_9_universal2.whl"
93+
},
94+
{
95+
"algorithm": "sha256",
96+
"hash": "06059eb6953ff01e56a25cd02cca1a9649a75a7e65397b5b9b4e929ed71d10cf",
97+
"url": "https://files.pythonhosted.org/packages/bf/2a/8924d1fbdf6cec34e9e58ee84b2a8bbdb2b58730c4cfab5a29934977ea6d/protobuf-3.20.1-cp38-cp38-macosx_10_9_x86_64.whl"
98+
},
99+
{
100+
"algorithm": "sha256",
101+
"hash": "32ca378605b41fd180dfe4e14d3226386d8d1b002ab31c969c366549e66a2bb7",
102+
"url": "https://files.pythonhosted.org/packages/c0/9c/bb88091287418ae1cf8af2bb9ed9710748a562b9abc227e4884d687a8650/protobuf-3.20.1-cp310-cp310-win_amd64.whl"
103+
},
104+
{
105+
"algorithm": "sha256",
106+
"hash": "69ccfdf3657ba59569c64295b7d51325f91af586f8d5793b734260dfe2e94e2c",
107+
"url": "https://files.pythonhosted.org/packages/c1/4d/1d46234fbdff4ee05cb7ec6cb6ea9282769fa9fefd72d93de4b85fd3d8c4/protobuf-3.20.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.whl"
108+
},
109+
{
110+
"algorithm": "sha256",
111+
"hash": "77053d28427a29987ca9caf7b72ccafee011257561259faba8dd308fda9a8739",
112+
"url": "https://files.pythonhosted.org/packages/e4/5e/381d134b6c9484d6d80dcace24dd3e0cc165d89b800b162fc52b4ac6941a/protobuf-3.20.1-cp38-cp38-win_amd64.whl"
113+
}
114+
],
115+
"project_name": "protobuf",
116+
"requires_dists": [],
117+
"requires_python": ">=3.7",
118+
"version": "3.20.1"
119+
},
120+
{
121+
"artifacts": [
122+
{
123+
"algorithm": "sha256",
124+
"hash": "8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254",
125+
"url": "https://files.pythonhosted.org/packages/d9/5a/e7c31adbe875f2abbb91bd84cf2dc52d792b5a01506781dbcf25c91daf11/six-1.16.0-py2.py3-none-any.whl"
126+
},
127+
{
128+
"algorithm": "sha256",
129+
"hash": "1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926",
130+
"url": "https://files.pythonhosted.org/packages/71/39/171f1c67cd00715f190ba0b100d606d440a28c93c7714febeca8b79af85e/six-1.16.0.tar.gz"
131+
}
132+
],
133+
"project_name": "six",
134+
"requires_dists": [],
135+
"requires_python": "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7",
136+
"version": "1.16"
137+
},
138+
{
139+
"artifacts": [
140+
{
141+
"algorithm": "sha256",
142+
"hash": "87c8205a71cf8bbb111cb99b1f7495070fbc9cabb671669568854210da5b3e29",
143+
"url": "https://files.pythonhosted.org/packages/6e/97/a73a1a62f62375b21464fa45a0093ef0b653cb14f7599cffce35d51c9161/thrift-0.15.0.tar.gz"
144+
}
145+
],
146+
"project_name": "thrift",
147+
"requires_dists": [
148+
"six>=1.7.2",
149+
"tornado>=4.0; extra == \"all\"",
150+
"tornado>=4.0; extra == \"tornado\"",
151+
"twisted; extra == \"all\"",
152+
"twisted; extra == \"twisted\""
153+
],
154+
"requires_python": null,
155+
"version": "0.15"
156+
}
157+
],
158+
"platform_tag": [
159+
"cp39",
160+
"cp39",
161+
"macosx_12_0_arm64"
162+
]
163+
}
164+
],
165+
"path_mappings": {},
166+
"pex_version": "2.1.90",
167+
"prefer_older_binary": false,
168+
"requirements": [
169+
"protobuf==3.20.1",
170+
"thrift==0.15.0"
171+
],
172+
"requires_python": [
173+
"<3.11,>=3.8"
174+
],
175+
"resolver_version": "pip-2020-resolver",
176+
"style": "universal",
177+
"transitive": true,
178+
"use_pep517": null
179+
}

‎3rdparty/python/requirements.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
protobuf>=3.19.0
1+
protobuf==3.20.1
22
thrift==0.15.0

‎pants.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[GLOBAL]
2-
pants_version = "2.11.0rc3"
2+
pants_version = "2.12.0"
33
backend_packages = [
44
"pants.backend.codegen.protobuf.lint.buf",
55
"pants.backend.codegen.protobuf.python",

0 commit comments

Comments
 (0)