Skip to content

Commit 8c82b6d

Browse files
authored
Merge branch 'master' into chromy/2025-05-20-add-dir
2 parents d64551f + 9f2b612 commit 8c82b6d

File tree

144 files changed

+2072
-2254
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

144 files changed

+2072
-2254
lines changed

.github/workflows/acceptance.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
8585
with:
8686
path: ${{ steps.config.outputs.webpack-path }}
87-
key: ${{ runner.os }}-v2-webpack-cache-${{ hashFiles('webpack.config.ts') }}
87+
key: ${{ runner.os }}-v2-webpack-cache-${{ hashFiles('rspack.config.ts', 'yarn.lock', 'package.json') }}
8888

8989
- name: node_modules cache
9090
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0

fixtures/stubs-for-mypy/progressbar/__init__.pyi

Lines changed: 0 additions & 2 deletions
This file was deleted.

fixtures/stubs-for-mypy/progressbar/bar.pyi

Lines changed: 0 additions & 14 deletions
This file was deleted.

fixtures/stubs-for-mypy/progressbar/widgets.pyi

Lines changed: 0 additions & 4 deletions
This file was deleted.

migrations_lockfile.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@ tempest: 0002_make_message_type_nullable
2929

3030
uptime: 0042_extra_uptime_indexes
3131

32-
workflow_engine: 0062_workflow_engine_missing_indexes
32+
workflow_engine: 0065_add_status_to_detector_and_workflow

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,8 @@
267267
"deref-api-docs": "ts-node api-docs/index.ts tests/apidocs/openapi-spectacular.json tests/apidocs/openapi-derefed.json",
268268
"build-chartcuterie-config": "node --experimental-strip-types config/build-chartcuterie.ts",
269269
"build-acceptance-rspack": "CODECOV_ENABLE_BA=false IS_ACCEPTANCE_TEST=1 NODE_ENV=production rspack",
270-
"build-acceptance": "CODECOV_ENABLE_BA=false IS_ACCEPTANCE_TEST=1 NODE_ENV=production webpack",
270+
"build-acceptance-webpack": "CODECOV_ENABLE_BA=false IS_ACCEPTANCE_TEST=1 NODE_ENV=production webpack",
271+
"build-acceptance": "yarn build-acceptance-rspack",
271272
"build-production": "NODE_ENV=production webpack --mode production",
272273
"build-production-rspack": "NODE_ENV=production rspack --mode production",
273274
"build": "NODE_OPTIONS=--max-old-space-size=4096 webpack",

requirements-base.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,14 @@ parsimonious>=0.10.0
4242
petname>=2.6
4343
phonenumberslite>=8.12.32
4444
Pillow>=11.0.0
45-
progressbar2>=3.41.0
4645
protobuf>=5.27.3
4746
proto-plus>=1.25.0
4847
python-rapidjson>=1.4
4948
psutil>=5.9.2
5049
psycopg2-binary>=2.9.10
5150
PyJWT>=2.4.0
5251
pydantic>=1.10.20,<2
53-
python-dateutil>=2.9.0
52+
python-dateutil>=2.9.0.post0
5453
pymemcache
5554
python-u2flib-server>=5.0.0
5655
fido2>=0.9.2
@@ -71,7 +70,7 @@ sentry-ophio>=1.1.3
7170
sentry-protos==0.2.0
7271
sentry-redis-tools>=0.5.0
7372
sentry-relay>=0.9.9
74-
sentry-sdk[http2]>=2.25.1
73+
sentry-sdk[http2]>=2.29.1
7574
slack-sdk>=3.27.2
7675
snuba-sdk>=3.0.43
7776
simplejson>=3.17.6

requirements-dev-frozen.txt

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ django==5.2.1
4444
django-crispy-forms==1.14.0
4545
django-csp==3.8
4646
django-pg-zero-downtime-migrations==0.18
47-
django-stubs-ext==5.1.3
47+
django-stubs-ext==5.2.0
4848
djangorestframework==3.16.0
4949
docker==7.1.0
5050
drf-spectacular==0.27.2
@@ -129,8 +129,7 @@ pip-tools==7.1.0
129129
platformdirs==4.2.0
130130
pluggy==1.5.0
131131
pre-commit==4.2.0
132-
progressbar2==3.41.0
133-
prompt-toolkit==3.0.41
132+
prompt-toolkit==3.0.51
134133
proto-plus==1.25.0
135134
protobuf==5.27.3
136135
psutil==5.9.7
@@ -155,10 +154,9 @@ pytest-rerunfailures==15.0
155154
pytest-sentry==0.3.0
156155
pytest-workaround-12888==1.0.0
157156
pytest-xdist==3.0.2
158-
python-dateutil==2.9.0
157+
python-dateutil==2.9.0.post0
159158
python-rapidjson==1.8
160159
python-u2flib-server==5.0.0
161-
python-utils==3.3.3
162160
python3-saml==1.15.0
163161
pyupgrade==3.19.1
164162
pyuwsgi==2.0.28.post1
@@ -184,18 +182,18 @@ sentry-arroyo==2.21.0
184182
sentry-cli==2.16.0
185183
sentry-covdefaults-disable-branch-coverage==1.0.2
186184
sentry-devenv==1.20.0
187-
sentry-forked-django-stubs==5.1.3.post2
188-
sentry-forked-djangorestframework-stubs==3.15.3.post1
185+
sentry-forked-django-stubs==5.2.0.post3
186+
sentry-forked-djangorestframework-stubs==3.16.0.post1
189187
sentry-forked-email-reply-parser==0.5.12.post1
190188
sentry-kafka-schemas==1.3.2
191189
sentry-ophio==1.1.3
192190
sentry-protos==0.2.0
193191
sentry-redis-tools==0.5.0
194192
sentry-relay==0.9.9
195-
sentry-sdk==2.27.0
193+
sentry-sdk==2.29.1
196194
sentry-usage-accountant==0.0.10
197195
simplejson==3.17.6
198-
six==1.16.0
196+
six==1.17.0
199197
slack-sdk==3.27.2
200198
sniffio==1.3.1
201199
snuba-sdk==3.0.43
@@ -234,15 +232,15 @@ types-setuptools==69.0.0.0
234232
types-simplejson==3.17.7.2
235233
types-unidiff==0.7.0.20240505
236234
typing-extensions==4.12.0
237-
tzdata==2023.3
235+
tzdata==2025.2
238236
ua-parser==0.10.0
239237
unidiff==0.7.4
240238
uritemplate==4.1.1
241239
urllib3==2.2.2
242240
vine==5.1.0
243241
virtualenv==20.26.6
244242
vroomrs==0.1.4
245-
wcwidth==0.2.10
243+
wcwidth==0.2.13
246244
werkzeug==3.0.6
247245
wheel==0.38.4
248246
wrapt==1.17.0

requirements-dev.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ pip-tools>=7.1.0
3838
packaging>=21.3
3939

4040
# for type checking
41-
sentry-forked-django-stubs>=5.1.3.post2
42-
sentry-forked-djangorestframework-stubs>=3.15.3.post1
41+
sentry-forked-django-stubs>=5.2.0.post3
42+
sentry-forked-djangorestframework-stubs>=3.16.0.post1
4343
lxml-stubs
4444
msgpack-types>=0.2.0
4545
mypy>=1.15

requirements-frozen.txt

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,7 @@ parsimonious==0.10.0
8888
petname==2.6
8989
phonenumberslite==8.12.55
9090
pillow==11.0.0
91-
progressbar2==3.41.0
92-
prompt-toolkit==3.0.41
91+
prompt-toolkit==3.0.51
9392
proto-plus==1.25.0
9493
protobuf==5.27.3
9594
psutil==5.9.7
@@ -101,10 +100,9 @@ pycparser==2.21
101100
pydantic==1.10.20
102101
pyjwt==2.4.0
103102
pymemcache==4.0.0
104-
python-dateutil==2.9.0
103+
python-dateutil==2.9.0.post0
105104
python-rapidjson==1.8
106105
python-u2flib-server==5.0.0
107-
python-utils==3.3.3
108106
python3-saml==1.15.0
109107
pyuwsgi==2.0.28.post1
110108
pyvat==1.3.15
@@ -130,10 +128,10 @@ sentry-ophio==1.1.3
130128
sentry-protos==0.2.0
131129
sentry-redis-tools==0.5.0
132130
sentry-relay==0.9.9
133-
sentry-sdk==2.27.0
131+
sentry-sdk==2.29.1
134132
sentry-usage-accountant==0.0.10
135133
simplejson==3.17.6
136-
six==1.16.0
134+
six==1.17.0
137135
slack-sdk==3.27.2
138136
sniffio==1.3.1
139137
snuba-sdk==3.0.43
@@ -148,14 +146,14 @@ tldextract==5.1.2
148146
toronado==0.1.0
149147
tqdm==4.66.4
150148
typing-extensions==4.12.0
151-
tzdata==2023.3
149+
tzdata==2025.2
152150
ua-parser==0.10.0
153151
unidiff==0.7.4
154152
uritemplate==4.1.1
155153
urllib3==2.2.2
156154
vine==5.1.0
157155
vroomrs==0.1.4
158-
wcwidth==0.2.10
156+
wcwidth==0.2.13
159157
xmlsec==1.3.14
160158
zstandard==0.18.0
161159

0 commit comments

Comments
 (0)