Skip to content

Commit 4d34398

Browse files
cognifloydcognifloyd
authored
Merge pull request #6120: Upgrade Pantsbuild to 2.18.3
2 parents afedd35 + 57f426d commit 4d34398

File tree

12 files changed

+663
-683
lines changed

12 files changed

+663
-683
lines changed

‎CHANGELOG.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Added
1919
* Continue introducing `pants <https://www.pantsbuild.org/docs>`_ to improve DX (Developer Experience)
2020
working on StackStorm, improve our security posture, and improve CI reliability thanks in part
2121
to pants' use of PEX lockfiles. This is not a user-facing addition.
22-
#6118 #6141 #6133
22+
#6118 #6141 #6133 #6120
2323
Contributed by @cognifloyd
2424
* Build of ST2 EL9 packages #6153
2525
Contributed by @amanda11

‎lint-configs/regex-lint.yaml‎

Lines changed: 3 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -3,62 +3,20 @@
33
# string with no escape characters (so it's particularly useful for expressing regexes).
44
# Adding quotes around these may change their meaning, so don't do so without thought.
55

6-
required_matches:
6+
required_matches: {}
77
# If we decide to enable this, remove the st2flake8
88
#python_source:
99
# - python_header
1010
#build_files:
1111
# - python_header
1212

13-
# TODO: In the future pants should get `visibility` and possibly other
14-
# features to restrict imports for dependees or dependencies.
15-
# We now have the rules. We just need the lint backend to check regularly.
16-
# - https://github.com/pantsbuild/pants/discussions/17389 dep rules
17-
# - https://github.com/pantsbuild/pants/issues/17634 visibility stabilization
18-
# - https://www.pantsbuild.org/v2.16/docs/validating-dependencies
19-
# We can use the visibility lint backend once we upgrade to pants 2.18:
20-
# https://www.pantsbuild.org/blog/2023/11/14/pants-2.18.0-is-released#more-visible-visibility
21-
22-
# st2client-dependencies-check
23-
st2client:
24-
- must_not_import_st2common
25-
26-
# st2common-circular-dependencies-check
27-
st2common:
28-
- must_not_import_st2reactor
29-
- must_not_import_st2api
30-
- must_not_import_st2auth
31-
#- must_not_import_st2actions
32-
#- must_not_import_st2stream
33-
st2common_except_services_inquiry:
34-
# The makefile excluded: runnersregistrar.py, compat.py, inquiry.py
35-
# runnersregistrar does not have an st2actions ref since 2016.
36-
# compat.py st2actions function was added and removed in 2017.
37-
# services/inquiry.py still imports st2actions.
38-
- must_not_import_st2actions
39-
st2common_except_router:
40-
# The makefile excluded router.py from st2stream check.
41-
# In router.py, "st2stream" is a string, not an import.
42-
- must_not_import_st2stream
43-
44-
path_patterns:
13+
path_patterns: []
4514
#- name: python_source
4615
# pattern: (?<!__init__)\.py$
4716
#- name: build_files
4817
# pattern: /BUILD$
4918

50-
- name: st2client
51-
pattern: st2client/st2client/.*\.py$
52-
- name: st2common
53-
pattern: st2common/st2common/.*\.py$
54-
55-
- name: st2common_except_services_inquiry
56-
pattern: st2common/st2common/(?!services/inquiry\.py).*\.py$
57-
58-
- name: st2common_except_router
59-
pattern: st2common/st2common/(?!router\.py).*\.py$
60-
61-
content_patterns:
19+
content_patterns: []
6220
#- name: python_header
6321
# pattern: |+
6422
# ^(?:#\!\/usr\/bin\/env python3
@@ -76,27 +34,3 @@ content_patterns:
7634
# # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
7735
# # See the License for the specific language governing permissions and
7836
# # limitations under the License.
79-
80-
- name: must_not_import_st2common
81-
pattern: st2common
82-
inverted: true
83-
84-
- name: must_not_import_st2reactor
85-
pattern: st2reactor
86-
inverted: true
87-
88-
- name: must_not_import_st2actions
89-
pattern: st2actions
90-
inverted: true
91-
92-
- name: must_not_import_st2api
93-
pattern: st2api
94-
inverted: true
95-
96-
- name: must_not_import_st2auth
97-
pattern: st2auth
98-
inverted: true
99-
100-
- name: must_not_import_st2stream
101-
pattern: st2stream
102-
inverted: true

‎lockfiles/bandit.lock‎

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -184,13 +184,13 @@
184184
"artifacts": [
185185
{
186186
"algorithm": "sha256",
187-
"hash": "385eb4edd9c9d5c17540511303e39a147ce2fc04bc55289c322b9e5904fe2c05",
188-
"url": "https://files.pythonhosted.org/packages/55/3a/5121b58b578a598b269537e09a316ad2a94fdd561a2c6eb75cd68578cc6b/setuptools-69.0.3-py3-none-any.whl"
187+
"hash": "c21c49fb1042386df081cb5d86759792ab89efca84cf114889191cd09aacc80c",
188+
"url": "https://files.pythonhosted.org/packages/92/e1/1c8bb3420105e70bdf357d57dd5567202b4ef8d27f810e98bb962d950834/setuptools-69.2.0-py3-none-any.whl"
189189
},
190190
{
191191
"algorithm": "sha256",
192-
"hash": "be1af57fc409f93647f2e8e4573a142ed38724b8cdd389706a867bb4efcf1e78",
193-
"url": "https://files.pythonhosted.org/packages/fc/c9/b146ca195403e0182a374e0ea4dbc69136bad3cd55bc293df496d625d0f7/setuptools-69.0.3.tar.gz"
192+
"hash": "0ff4183f8f42cd8fa3acea16c45205521a4ef28f73c6391d8a25e92893134f2e",
193+
"url": "https://files.pythonhosted.org/packages/4d/5b/dc575711b6b8f2f866131a40d053e30e962e633b332acf7cd2c24843d83d/setuptools-69.2.0.tar.gz"
194194
}
195195
],
196196
"project_name": "setuptools",
@@ -199,8 +199,8 @@
199199
"build[virtualenv]>=1.0.3; extra == \"testing-integration\"",
200200
"filelock>=3.4.0; extra == \"testing\"",
201201
"filelock>=3.4.0; extra == \"testing-integration\"",
202-
"flake8-2020; extra == \"testing\"",
203202
"furo; extra == \"docs\"",
203+
"importlib-metadata; extra == \"testing\"",
204204
"ini2toml[lite]>=0.9; extra == \"testing\"",
205205
"jaraco.develop>=7.21; (python_version >= \"3.9\" and sys_platform != \"cygwin\") and extra == \"testing\"",
206206
"jaraco.envs>=2.2; extra == \"testing\"",
@@ -209,20 +209,22 @@
209209
"jaraco.path>=3.2.0; extra == \"testing\"",
210210
"jaraco.path>=3.2.0; extra == \"testing-integration\"",
211211
"jaraco.tidelift>=1.4; extra == \"docs\"",
212-
"packaging>=23.1; extra == \"testing-integration\"",
212+
"mypy==1.9; extra == \"testing\"",
213+
"packaging>=23.2; extra == \"testing\"",
214+
"packaging>=23.2; extra == \"testing-integration\"",
213215
"pip>=19.1; extra == \"testing\"",
214216
"pygments-github-lexers==0.0.5; extra == \"docs\"",
215-
"pytest-black>=0.3.7; platform_python_implementation != \"PyPy\" and extra == \"testing\"",
216217
"pytest-checkdocs>=2.4; extra == \"testing\"",
217218
"pytest-cov; platform_python_implementation != \"PyPy\" and extra == \"testing\"",
218219
"pytest-enabler; extra == \"testing-integration\"",
219220
"pytest-enabler>=2.2; extra == \"testing\"",
221+
"pytest-home>=0.5; extra == \"testing\"",
220222
"pytest-mypy>=0.9.1; platform_python_implementation != \"PyPy\" and extra == \"testing\"",
221223
"pytest-perf; sys_platform != \"cygwin\" and extra == \"testing\"",
222-
"pytest-ruff; sys_platform != \"cygwin\" and extra == \"testing\"",
224+
"pytest-ruff>=0.2.1; sys_platform != \"cygwin\" and extra == \"testing\"",
223225
"pytest-timeout; extra == \"testing\"",
224-
"pytest-xdist; extra == \"testing\"",
225226
"pytest-xdist; extra == \"testing-integration\"",
227+
"pytest-xdist>=3; extra == \"testing\"",
226228
"pytest; extra == \"testing-integration\"",
227229
"pytest>=6; extra == \"testing\"",
228230
"rst.linker>=1.9; extra == \"docs\"",
@@ -235,14 +237,15 @@
235237
"sphinx>=3.5; extra == \"docs\"",
236238
"sphinxcontrib-towncrier; extra == \"docs\"",
237239
"tomli-w>=1.0.0; extra == \"testing\"",
240+
"tomli; extra == \"testing\"",
238241
"tomli; extra == \"testing-integration\"",
239242
"virtualenv>=13.0.0; extra == \"testing\"",
240243
"virtualenv>=13.0.0; extra == \"testing-integration\"",
241244
"wheel; extra == \"testing\"",
242245
"wheel; extra == \"testing-integration\""
243246
],
244247
"requires_python": ">=3.8",
245-
"version": "69.0.3"
248+
"version": "69.2.0"
246249
},
247250
{
248251
"artifacts": [
@@ -284,21 +287,21 @@
284287
"artifacts": [
285288
{
286289
"algorithm": "sha256",
287-
"hash": "8cc040628f3cea5d7128f2e76cf486b2251a4e543c7b938f58d9a377f6694a2d",
288-
"url": "https://files.pythonhosted.org/packages/4b/68/e739fd061b0aba464bef8e8be48428b2aabbfb3f2f8f2f8ca257363ee6b2/stevedore-5.1.0-py3-none-any.whl"
290+
"hash": "1c15d95766ca0569cad14cb6272d4d31dae66b011a929d7c18219c176ea1b5c9",
291+
"url": "https://files.pythonhosted.org/packages/eb/f1/c7c6205c367c764ee173537f7eaf070bba4dd0fa11bf081813c2f75285a3/stevedore-5.2.0-py3-none-any.whl"
289292
},
290293
{
291294
"algorithm": "sha256",
292-
"hash": "a54534acf9b89bc7ed264807013b505bf07f74dbe4bcfa37d32bd063870b087c",
293-
"url": "https://files.pythonhosted.org/packages/ac/d6/77387d3fc81f07bc8877e6f29507bd7943569093583b0a07b28cfa286780/stevedore-5.1.0.tar.gz"
295+
"hash": "46b93ca40e1114cea93d738a6c1e365396981bb6bb78c27045b7587c9473544d",
296+
"url": "https://files.pythonhosted.org/packages/e7/c1/b210bf1071c96ecfcd24c2eeb4c828a2a24bf74b38af13896d02203b1eec/stevedore-5.2.0.tar.gz"
294297
}
295298
],
296299
"project_name": "stevedore",
297300
"requires_dists": [
298301
"pbr!=2.1.0,>=2.0.0"
299302
],
300303
"requires_python": ">=3.8",
301-
"version": "5.1.0"
304+
"version": "5.2.0"
302305
}
303306
],
304307
"platform_tag": null

‎lockfiles/black.lock‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -161,29 +161,29 @@
161161
"artifacts": [
162162
{
163163
"algorithm": "sha256",
164-
"hash": "11c8f37bcca40db96d8144522d925583bdb7a31f7b0e37e3ed4318400a8e2380",
165-
"url": "https://files.pythonhosted.org/packages/be/53/42fe5eab4a09d251a76d0043e018172db324a23fcdac70f77a551c11f618/platformdirs-4.1.0-py3-none-any.whl"
164+
"hash": "0614df2a2f37e1a662acbd8e2b25b92ccf8632929bc6d43467e17fe89c75e068",
165+
"url": "https://files.pythonhosted.org/packages/55/72/4898c44ee9ea6f43396fbc23d9bfaf3d06e01b83698bdf2e4c919deceb7c/platformdirs-4.2.0-py3-none-any.whl"
166166
},
167167
{
168168
"algorithm": "sha256",
169-
"hash": "906d548203468492d432bcb294d4bc2fff751bf84971fbb2c10918cc206ee420",
170-
"url": "https://files.pythonhosted.org/packages/62/d1/7feaaacb1a3faeba96c06e6c5091f90695cc0f94b7e8e1a3a3fe2b33ff9a/platformdirs-4.1.0.tar.gz"
169+
"hash": "ef0cc731df711022c174543cb70a9b5bd22e5a9337c8624ef2c2ceb8ddad8768",
170+
"url": "https://files.pythonhosted.org/packages/96/dc/c1d911bf5bb0fdc58cc05010e9f3efe3b67970cef779ba7fbc3183b987a8/platformdirs-4.2.0.tar.gz"
171171
}
172172
],
173173
"project_name": "platformdirs",
174174
"requires_dists": [
175175
"appdirs==1.4.4; extra == \"test\"",
176176
"covdefaults>=2.3; extra == \"test\"",
177-
"furo>=2023.7.26; extra == \"docs\"",
177+
"furo>=2023.9.10; extra == \"docs\"",
178178
"proselint>=0.13; extra == \"docs\"",
179179
"pytest-cov>=4.1; extra == \"test\"",
180-
"pytest-mock>=3.11.1; extra == \"test\"",
181-
"pytest>=7.4; extra == \"test\"",
182-
"sphinx-autodoc-typehints>=1.24; extra == \"docs\"",
183-
"sphinx>=7.1.1; extra == \"docs\""
180+
"pytest-mock>=3.12; extra == \"test\"",
181+
"pytest>=7.4.3; extra == \"test\"",
182+
"sphinx-autodoc-typehints>=1.25.2; extra == \"docs\"",
183+
"sphinx>=7.2.6; extra == \"docs\""
184184
],
185185
"requires_python": ">=3.8",
186-
"version": "4.1.0"
186+
"version": "4.2.0"
187187
},
188188
{
189189
"artifacts": [
@@ -207,19 +207,19 @@
207207
"artifacts": [
208208
{
209209
"algorithm": "sha256",
210-
"hash": "af72aea155e91adfc61c3ae9e0e342dbc0cba726d6cba4b6c72c1f34e47291cd",
211-
"url": "https://files.pythonhosted.org/packages/b7/f4/6a90020cd2d93349b442bfcb657d0dc91eee65491600b2cb1d388bc98e6b/typing_extensions-4.9.0-py3-none-any.whl"
210+
"hash": "69b1a937c3a517342112fb4c6df7e72fc39a38e7891a5730ed4985b5214b5475",
211+
"url": "https://files.pythonhosted.org/packages/f9/de/dc04a3ea60b22624b51c703a84bbe0184abcd1d0b9bc8074b5d6b7ab90bb/typing_extensions-4.10.0-py3-none-any.whl"
212212
},
213213
{
214214
"algorithm": "sha256",
215-
"hash": "23478f88c37f27d76ac8aee6c905017a143b0b1b886c3c9f66bc2fd94f9f5783",
216-
"url": "https://files.pythonhosted.org/packages/0c/1d/eb26f5e75100d531d7399ae800814b069bc2ed2a7410834d57374d010d96/typing_extensions-4.9.0.tar.gz"
215+
"hash": "b0abd7c89e8fb96f98db18d86106ff1d90ab692004eb746cf6eda2682f91b3cb",
216+
"url": "https://files.pythonhosted.org/packages/16/3a/0d26ce356c7465a19c9ea8814b960f8a36c3b0d07c323176620b7b483e44/typing_extensions-4.10.0.tar.gz"
217217
}
218218
],
219219
"project_name": "typing-extensions",
220220
"requires_dists": [],
221221
"requires_python": ">=3.8",
222-
"version": "4.9.0"
222+
"version": "4.10.0"
223223
}
224224
],
225225
"platform_tag": null

‎lockfiles/flake8.lock‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -154,13 +154,13 @@
154154
"artifacts": [
155155
{
156156
"algorithm": "sha256",
157-
"hash": "385eb4edd9c9d5c17540511303e39a147ce2fc04bc55289c322b9e5904fe2c05",
158-
"url": "https://files.pythonhosted.org/packages/55/3a/5121b58b578a598b269537e09a316ad2a94fdd561a2c6eb75cd68578cc6b/setuptools-69.0.3-py3-none-any.whl"
157+
"hash": "c21c49fb1042386df081cb5d86759792ab89efca84cf114889191cd09aacc80c",
158+
"url": "https://files.pythonhosted.org/packages/92/e1/1c8bb3420105e70bdf357d57dd5567202b4ef8d27f810e98bb962d950834/setuptools-69.2.0-py3-none-any.whl"
159159
},
160160
{
161161
"algorithm": "sha256",
162-
"hash": "be1af57fc409f93647f2e8e4573a142ed38724b8cdd389706a867bb4efcf1e78",
163-
"url": "https://files.pythonhosted.org/packages/fc/c9/b146ca195403e0182a374e0ea4dbc69136bad3cd55bc293df496d625d0f7/setuptools-69.0.3.tar.gz"
162+
"hash": "0ff4183f8f42cd8fa3acea16c45205521a4ef28f73c6391d8a25e92893134f2e",
163+
"url": "https://files.pythonhosted.org/packages/4d/5b/dc575711b6b8f2f866131a40d053e30e962e633b332acf7cd2c24843d83d/setuptools-69.2.0.tar.gz"
164164
}
165165
],
166166
"project_name": "setuptools",
@@ -169,8 +169,8 @@
169169
"build[virtualenv]>=1.0.3; extra == \"testing-integration\"",
170170
"filelock>=3.4.0; extra == \"testing\"",
171171
"filelock>=3.4.0; extra == \"testing-integration\"",
172-
"flake8-2020; extra == \"testing\"",
173172
"furo; extra == \"docs\"",
173+
"importlib-metadata; extra == \"testing\"",
174174
"ini2toml[lite]>=0.9; extra == \"testing\"",
175175
"jaraco.develop>=7.21; (python_version >= \"3.9\" and sys_platform != \"cygwin\") and extra == \"testing\"",
176176
"jaraco.envs>=2.2; extra == \"testing\"",
@@ -179,20 +179,22 @@
179179
"jaraco.path>=3.2.0; extra == \"testing\"",
180180
"jaraco.path>=3.2.0; extra == \"testing-integration\"",
181181
"jaraco.tidelift>=1.4; extra == \"docs\"",
182-
"packaging>=23.1; extra == \"testing-integration\"",
182+
"mypy==1.9; extra == \"testing\"",
183+
"packaging>=23.2; extra == \"testing\"",
184+
"packaging>=23.2; extra == \"testing-integration\"",
183185
"pip>=19.1; extra == \"testing\"",
184186
"pygments-github-lexers==0.0.5; extra == \"docs\"",
185-
"pytest-black>=0.3.7; platform_python_implementation != \"PyPy\" and extra == \"testing\"",
186187
"pytest-checkdocs>=2.4; extra == \"testing\"",
187188
"pytest-cov; platform_python_implementation != \"PyPy\" and extra == \"testing\"",
188189
"pytest-enabler; extra == \"testing-integration\"",
189190
"pytest-enabler>=2.2; extra == \"testing\"",
191+
"pytest-home>=0.5; extra == \"testing\"",
190192
"pytest-mypy>=0.9.1; platform_python_implementation != \"PyPy\" and extra == \"testing\"",
191193
"pytest-perf; sys_platform != \"cygwin\" and extra == \"testing\"",
192-
"pytest-ruff; sys_platform != \"cygwin\" and extra == \"testing\"",
194+
"pytest-ruff>=0.2.1; sys_platform != \"cygwin\" and extra == \"testing\"",
193195
"pytest-timeout; extra == \"testing\"",
194-
"pytest-xdist; extra == \"testing\"",
195196
"pytest-xdist; extra == \"testing-integration\"",
197+
"pytest-xdist>=3; extra == \"testing\"",
196198
"pytest; extra == \"testing-integration\"",
197199
"pytest>=6; extra == \"testing\"",
198200
"rst.linker>=1.9; extra == \"docs\"",
@@ -205,14 +207,15 @@
205207
"sphinx>=3.5; extra == \"docs\"",
206208
"sphinxcontrib-towncrier; extra == \"docs\"",
207209
"tomli-w>=1.0.0; extra == \"testing\"",
210+
"tomli; extra == \"testing\"",
208211
"tomli; extra == \"testing-integration\"",
209212
"virtualenv>=13.0.0; extra == \"testing\"",
210213
"virtualenv>=13.0.0; extra == \"testing-integration\"",
211214
"wheel; extra == \"testing\"",
212215
"wheel; extra == \"testing-integration\""
213216
],
214217
"requires_python": ">=3.8",
215-
"version": "69.0.3"
218+
"version": "69.2.0"
216219
},
217220
{
218221
"artifacts": [

0 commit comments

Comments
 (0)