Skip to content

Commit 2f7cf10

Browse files
thodson-usgsclaude
andcommitted
Apply ruff format under the new py39 target
Bumping ruff target-version from py38 to py39 made the formatter prefer parenthesized context managers (a 3.9-PEG-parser feature). The CI lint job picked up the resulting drift in tests/waterdata_filters_test.py; apply the formatter to bring it back in line. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
1 parent 3a6cad9 commit 2f7cf10

1 file changed

Lines changed: 47 additions & 32 deletions

File tree

tests/waterdata_filters_test.py

Lines changed: 47 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -190,14 +190,18 @@ def fake_walk_pages(*_args, **_kwargs):
190190
frame = pd.DataFrame({"id": [f"chunk-{idx}"], "value": [idx]})
191191
return frame, _fake_response()
192192

193-
with mock.patch(
194-
"dataretrieval.waterdata.utils._construct_api_requests",
195-
side_effect=fake_construct_api_requests,
196-
), mock.patch(
197-
"dataretrieval.waterdata.utils._walk_pages", side_effect=fake_walk_pages
198-
), mock.patch(
199-
"dataretrieval.waterdata.filters._effective_filter_budget",
200-
return_value=_CQL_FILTER_CHUNK_LEN,
193+
with (
194+
mock.patch(
195+
"dataretrieval.waterdata.utils._construct_api_requests",
196+
side_effect=fake_construct_api_requests,
197+
),
198+
mock.patch(
199+
"dataretrieval.waterdata.utils._walk_pages", side_effect=fake_walk_pages
200+
),
201+
mock.patch(
202+
"dataretrieval.waterdata.filters._effective_filter_budget",
203+
return_value=_CQL_FILTER_CHUNK_LEN,
204+
),
201205
):
202206
df, _ = get_continuous(
203207
monitoring_location_id="USGS-07374525",
@@ -239,14 +243,18 @@ def fake_walk_pages(*_args, **_kwargs):
239243
frame = pd.DataFrame({"id": ["shared-feature"], "value": [1]})
240244
return frame, _fake_response()
241245

242-
with mock.patch(
243-
"dataretrieval.waterdata.utils._construct_api_requests",
244-
return_value=_fake_prepared_request(),
245-
), mock.patch(
246-
"dataretrieval.waterdata.utils._walk_pages", side_effect=fake_walk_pages
247-
), mock.patch(
248-
"dataretrieval.waterdata.filters._effective_filter_budget",
249-
return_value=_CQL_FILTER_CHUNK_LEN,
246+
with (
247+
mock.patch(
248+
"dataretrieval.waterdata.utils._construct_api_requests",
249+
return_value=_fake_prepared_request(),
250+
),
251+
mock.patch(
252+
"dataretrieval.waterdata.utils._walk_pages", side_effect=fake_walk_pages
253+
),
254+
mock.patch(
255+
"dataretrieval.waterdata.filters._effective_filter_budget",
256+
return_value=_CQL_FILTER_CHUNK_LEN,
257+
),
250258
):
251259
df, _ = get_continuous(
252260
monitoring_location_id="USGS-07374525",
@@ -293,14 +301,18 @@ def fake_walk_pages(*_args, **_kwargs):
293301
)
294302
return frame, _fake_response()
295303

296-
with mock.patch(
297-
"dataretrieval.waterdata.utils._construct_api_requests",
298-
return_value=_fake_prepared_request(),
299-
), mock.patch(
300-
"dataretrieval.waterdata.utils._walk_pages", side_effect=fake_walk_pages
301-
), mock.patch(
302-
"dataretrieval.waterdata.filters._effective_filter_budget",
303-
return_value=_CQL_FILTER_CHUNK_LEN,
304+
with (
305+
mock.patch(
306+
"dataretrieval.waterdata.utils._construct_api_requests",
307+
return_value=_fake_prepared_request(),
308+
),
309+
mock.patch(
310+
"dataretrieval.waterdata.utils._walk_pages", side_effect=fake_walk_pages
311+
),
312+
mock.patch(
313+
"dataretrieval.waterdata.filters._effective_filter_budget",
314+
return_value=_CQL_FILTER_CHUNK_LEN,
315+
),
304316
):
305317
df, _ = get_continuous(
306318
monitoring_location_id="USGS-07374525",
@@ -434,14 +446,17 @@ def fake_construct_api_requests(**kwargs):
434446
sent_filters.append(kwargs.get("filter"))
435447
return _fake_prepared_request()
436448

437-
with mock.patch(
438-
"dataretrieval.waterdata.utils._construct_api_requests",
439-
side_effect=fake_construct_api_requests,
440-
), mock.patch(
441-
"dataretrieval.waterdata.utils._walk_pages",
442-
return_value=(
443-
pd.DataFrame({"id": ["row-1"], "value": [1]}),
444-
_fake_response(),
449+
with (
450+
mock.patch(
451+
"dataretrieval.waterdata.utils._construct_api_requests",
452+
side_effect=fake_construct_api_requests,
453+
),
454+
mock.patch(
455+
"dataretrieval.waterdata.utils._walk_pages",
456+
return_value=(
457+
pd.DataFrame({"id": ["row-1"], "value": [1]}),
458+
_fake_response(),
459+
),
445460
),
446461
):
447462
get_continuous(

0 commit comments

Comments
 (0)