Skip to content

Commit fbd61ea

Browse files
authored
Merge pull request #225 from alphagov/unpin-and-refreeze
Relax all pins using compatible version operator and re-freeze
2 parents 76539a8 + 1c61c8b commit fbd61ea

File tree

7 files changed

+61
-55
lines changed

7 files changed

+61
-55
lines changed

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was automatically copied from notifications-utils@108.5.0
1+
# This file was automatically copied from notifications-utils@110.0.1
22

33
repos:
44
- repo: https://github.com/pre-commit/pre-commit-hooks
@@ -9,7 +9,7 @@ repos:
99
- id: check-yaml
1010
- id: debug-statements
1111
- repo: https://github.com/charliermarsh/ruff-pre-commit
12-
rev: 'v0.11.4'
12+
rev: 'v0.15.2'
1313
hooks:
1414
- id: ruff
1515
args: [--fix, --exit-non-zero-on-fix]

requirements.in

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
clamd==1.0.2
2-
celery[sqs]==5.4.0
1+
clamd~=1.0
2+
celery[sqs]~=5.6
3+
34
# Pin kombu to merge of PR #2342 (SQS fair queue / MessageGroupId support) until kombu 5.7 is released
45
kombu @ git+https://github.com/celery/kombu.git@860e40a6c904c4d8551577d9f4e8c00f03b6e06c
56
Flask-HTTPAuth==4.8.0
67

78
# Run `make bump-utils` to update to the latest version
8-
notifications-utils @ git+https://github.com/alphagov/notifications-utils.git@108.5.0
9+
notifications-utils @ git+https://github.com/alphagov/notifications-utils.git@110.0.1
910

10-
# gds-metrics requires prometheseus 0.2.0, override that requirement as later versions bring significant performance gains
11-
prometheus-client==0.15.0
1211
git+https://github.com/alphagov/gds_metrics_python.git@6f1840a57b6fb1ee40b7e84f2f18ec229de8aa72
1312

14-
sentry_sdk[flask,celery]==1.45.1
13+
sentry_sdk[flask,celery]~=1.45

requirements.txt

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,22 @@ blinker==1.9.0
1111
# flask
1212
# gds-metrics
1313
# sentry-sdk
14-
boto3==1.42.55
14+
boto3==1.42.59
1515
# via
1616
# celery
1717
# kombu
1818
# notifications-utils
19-
botocore==1.42.55
19+
botocore==1.42.59
2020
# via
2121
# boto3
2222
# s3transfer
23-
cachetools==7.0.1
23+
cachetools==7.0.2
2424
# via notifications-utils
25-
celery==5.4.0
25+
celery==5.6.2
2626
# via
2727
# -r requirements.in
2828
# sentry-sdk
29-
certifi==2026.1.4
29+
certifi==2026.2.25
3030
# via
3131
# requests
3232
# sentry-sdk
@@ -64,7 +64,7 @@ flask-redis==0.4.0
6464
# via notifications-utils
6565
gds-metrics @ git+https://github.com/alphagov/gds_metrics_python.git@6f1840a57b6fb1ee40b7e84f2f18ec229de8aa72
6666
# via -r requirements.in
67-
govuk-bank-holidays==0.18
67+
govuk-bank-holidays==0.19
6868
# via notifications-utils
6969
greenlet==3.3.2
7070
# via eventlet
@@ -96,20 +96,18 @@ markupsafe==3.0.3
9696
# werkzeug
9797
mistune==0.8.4
9898
# via notifications-utils
99-
notifications-utils @ git+https://github.com/alphagov/notifications-utils.git@043dcf4df0ebd183dc26b99d82362dab5d3ce47c
99+
notifications-utils @ git+https://github.com/alphagov/notifications-utils.git@7b3ed394d8c211e0bfcc55fe037fedbe82d8c30e
100100
# via -r requirements.in
101101
ordered-set==4.1.0
102102
# via notifications-utils
103103
packaging==26.0
104104
# via
105105
# gunicorn
106106
# kombu
107-
phonenumbers==9.0.24
107+
phonenumbers==9.0.25
108108
# via notifications-utils
109-
prometheus-client==0.15.0
110-
# via
111-
# -r requirements.in
112-
# gds-metrics
109+
prometheus-client==0.24.1
110+
# via gds-metrics
113111
prompt-toolkit==3.0.52
114112
# via click-repl
115113
pycurl==7.45.7
@@ -127,7 +125,7 @@ python-json-logger==4.0.0
127125
# via notifications-utils
128126
pyyaml==6.0.3
129127
# via notifications-utils
130-
redis==7.2.0
128+
redis==7.2.1
131129
# via flask-redis
132130
requests==2.32.5
133131
# via
@@ -146,9 +144,9 @@ smartypants==2.0.2
146144
statsd==4.0.1
147145
# via notifications-utils
148146
tzdata==2025.3
149-
# via
150-
# celery
151-
# kombu
147+
# via kombu
148+
tzlocal==5.3.1
149+
# via celery
152150
urllib3==2.6.3
153151
# via
154152
# botocore

requirements_for_test.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
-r requirements.txt
22
-r requirements_for_test_common.in
33

4-
jinja2-cli[yaml]==0.8.2
4+
jinja2-cli[yaml]~=0.8

requirements_for_test.txt

Lines changed: 28 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ awscrt==0.31.2
88
# via
99
# -r requirements.txt
1010
# botocore
11-
beautifulsoup4==4.12.3
11+
beautifulsoup4==4.14.3
1212
# via -r requirements_for_test_common.in
1313
billiard==4.2.4
1414
# via
@@ -19,22 +19,22 @@ blinker==1.9.0
1919
# -r requirements.txt
2020
# flask
2121
# gds-metrics
22-
boto3==1.42.55
22+
boto3==1.42.59
2323
# via
2424
# -r requirements.txt
2525
# notifications-utils
26-
botocore==1.42.55
26+
botocore==1.42.59
2727
# via
2828
# -r requirements.txt
2929
# boto3
3030
# s3transfer
31-
cachetools==7.0.1
31+
cachetools==7.0.2
3232
# via
3333
# -r requirements.txt
3434
# notifications-utils
35-
celery==5.4.0
35+
celery==5.6.2
3636
# via -r requirements.txt
37-
certifi==2026.1.4
37+
certifi==2026.2.25
3838
# via
3939
# -r requirements.txt
4040
# requests
@@ -90,11 +90,11 @@ flask-redis==0.4.0
9090
# via
9191
# -r requirements.txt
9292
# notifications-utils
93-
freezegun==1.5.1
93+
freezegun==1.5.5
9494
# via -r requirements_for_test_common.in
9595
gds-metrics @ git+https://github.com/alphagov/gds_metrics_python.git@6f1840a57b6fb1ee40b7e84f2f18ec229de8aa72
9696
# via -r requirements.txt
97-
govuk-bank-holidays==0.18
97+
govuk-bank-holidays==0.19
9898
# via
9999
# -r requirements.txt
100100
# notifications-utils
@@ -144,7 +144,7 @@ mistune==0.8.4
144144
# via
145145
# -r requirements.txt
146146
# notifications-utils
147-
notifications-utils @ git+https://github.com/alphagov/notifications-utils.git@043dcf4df0ebd183dc26b99d82362dab5d3ce47c
147+
notifications-utils @ git+https://github.com/alphagov/notifications-utils.git@7b3ed394d8c211e0bfcc55fe037fedbe82d8c30e
148148
# via -r requirements.txt
149149
ordered-set==4.1.0
150150
# via
@@ -156,13 +156,13 @@ packaging==26.0
156156
# gunicorn
157157
# kombu
158158
# pytest
159-
phonenumbers==9.0.24
159+
phonenumbers==9.0.25
160160
# via
161161
# -r requirements.txt
162162
# notifications-utils
163163
pluggy==1.6.0
164164
# via pytest
165-
prometheus-client==0.15.0
165+
prometheus-client==0.24.1
166166
# via
167167
# -r requirements.txt
168168
# gds-metrics
@@ -172,24 +172,26 @@ prompt-toolkit==3.0.52
172172
# click-repl
173173
pycurl==7.45.7
174174
# via -r requirements.txt
175+
pygments==2.19.2
176+
# via pytest
175177
pypdf==6.7.5
176178
# via
177179
# -r requirements.txt
178180
# notifications-utils
179-
pytest==8.3.4
181+
pytest==9.0.2
180182
# via
181183
# -r requirements_for_test_common.in
182184
# pytest-env
183185
# pytest-mock
184186
# pytest-testmon
185187
# pytest-xdist
186-
pytest-env==1.1.5
188+
pytest-env==1.5.0
187189
# via -r requirements_for_test_common.in
188-
pytest-mock==3.14.0
190+
pytest-mock==3.15.1
189191
# via -r requirements_for_test_common.in
190-
pytest-testmon==2.1.1
192+
pytest-testmon==2.2.0
191193
# via -r requirements_for_test_common.in
192-
pytest-xdist==3.6.1
194+
pytest-xdist==3.8.0
193195
# via -r requirements_for_test_common.in
194196
python-dateutil==2.9.0.post0
195197
# via
@@ -198,6 +200,8 @@ python-dateutil==2.9.0.post0
198200
# celery
199201
# freezegun
200202
# notifications-utils
203+
python-dotenv==1.2.2
204+
# via pytest-env
201205
python-json-logger==4.0.0
202206
# via
203207
# -r requirements.txt
@@ -207,7 +211,7 @@ pyyaml==6.0.3
207211
# -r requirements.txt
208212
# jinja2-cli
209213
# notifications-utils
210-
redis==7.2.0
214+
redis==7.2.1
211215
# via
212216
# -r requirements.txt
213217
# flask-redis
@@ -219,7 +223,7 @@ requests==2.32.5
219223
# requests-mock
220224
requests-mock==1.12.1
221225
# via -r requirements_for_test_common.in
222-
ruff==0.11.4
226+
ruff==0.15.2
223227
# via -r requirements_for_test_common.in
224228
s3transfer==0.16.0
225229
# via
@@ -245,11 +249,16 @@ statsd==4.0.1
245249
# via
246250
# -r requirements.txt
247251
# notifications-utils
252+
typing-extensions==4.15.0
253+
# via beautifulsoup4
248254
tzdata==2025.3
249255
# via
250256
# -r requirements.txt
251-
# celery
252257
# kombu
258+
tzlocal==5.3.1
259+
# via
260+
# -r requirements.txt
261+
# celery
253262
urllib3==2.6.3
254263
# via
255264
# -r requirements.txt

requirements_for_test_common.in

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
# This file was automatically copied from notifications-utils@108.5.0
1+
# This file was automatically copied from notifications-utils@110.0.1
22

3-
beautifulsoup4==4.12.3
4-
pytest==8.3.4
5-
pytest-env==1.1.5
6-
pytest-mock==3.14.0
7-
pytest-xdist==3.6.1
8-
pytest-testmon==2.1.1
9-
requests-mock==1.12.1
10-
freezegun==1.5.1
3+
beautifulsoup4
4+
pytest
5+
pytest-env
6+
pytest-mock
7+
pytest-xdist
8+
pytest-testmon
9+
requests-mock
10+
freezegun
1111

12-
ruff==0.11.4 # Also update `.pre-commit-config.yaml` if this changes
12+
ruff==0.15.2 # Also update `.pre-commit-config.yaml` if this changes

ruff.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was automatically copied from notifications-utils@108.5.0
1+
# This file was automatically copied from notifications-utils@110.0.1
22

33
extend-exclude = [
44
"migrations/versions/",

0 commit comments

Comments
 (0)