Skip to content

Commit c3987e9

Browse files
davidfrederiquedavidfrederique
authored
Merge pull request #260 from BEMServer/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2 parents 41d8fd2 + 5285c67 commit c3987e9

File tree

6 files changed

+35
-37
lines changed

6 files changed

+35
-37
lines changed

‎.pre-commit-config.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ ci:
44

55
repos:
66
- repo: https://github.com/astral-sh/ruff-pre-commit
7-
rev: v0.8.6
7+
rev: v0.9.4
88
hooks:
99
- id: ruff
1010
- id: ruff-format
1111
- repo: https://github.com/python-jsonschema/check-jsonschema
12-
rev: 0.30.0
12+
rev: 0.31.1
1313
hooks:
1414
- id: check-github-workflows
1515
- repo: https://github.com/asottile/blacken-docs

‎tests/conftest.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ def app(request, bsc_config, monkeypatch):
9999
for user in USERS.values():
100100
user["hba_creds"] = (
101101
"Basic "
102-
+ base64.b64encode(f'{user["email"]}:{user["password"]}'.encode()).decode()
102+
+ base64.b64encode(f"{user['email']}:{user['password']}".encode()).decode()
103103
)
104104
user["creds"] = "Bearer " + make_token(user["email"], "access")
105105

‎tests/extensions/test_authentication.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ def test_auth_validation_error(self, app):
122122
def test_auth_login_required_http_basic_auth(self, app, users):
123123
active_user_hba_creds = users["Active"]["hba_creds"]
124124
active_user_invalid_hba_creds = base64.b64encode(
125-
f'{users["Active"]["user"].email}:bad_pwd'.encode()
125+
f"{users['Active']['user'].email}:bad_pwd".encode()
126126
).decode()
127127
inactive_user_hba_creds = users["Inactive"]["hba_creds"]
128128
active_user_jwt = users["Active"]["creds"]

‎tests/resources/analysis/test_energy_consumption.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def _create_data(self, campaign_id, campaign_scope_id):
3939
timeseries = []
4040
for i in range(9):
4141
ts_i = Timeseries(
42-
name=f"Timeseries {i+1}",
42+
name=f"Timeseries {i + 1}",
4343
campaign_id=campaign_id,
4444
campaign_scope_id=campaign_scope_id,
4545
unit_symbol=("Wh" if i < 6 else "kWh"),

‎tests/resources/test_input_output.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ def test_sites_csv_post_update(self, app, users, campaigns):
134134
assert ret.status_code == 200
135135
assert len(ret.json) == 2
136136

137-
sites_csv = "Name,Description,IFC_ID,Area\n" "Site 2,Greatest site 2,,3000\n"
137+
sites_csv = "Name,Description,IFC_ID,Area\nSite 2,Greatest site 2,,3000\n"
138138
buildings_csv = (
139139
"Name,Description,Site,IFC_ID,Area\n"
140140
"Building 2,Greatest building 2,Site 2,,3000\n"
@@ -221,9 +221,7 @@ def test_sites_csv_post_unknown_campaign(self, app, users):
221221
client = app.test_client()
222222

223223
sites_csv = (
224-
"Name,Description,IFC_ID\n"
225-
"Site 1,Great site 1,\n"
226-
"Site 1,Great site 2,\n"
224+
"Name,Description,IFC_ID\nSite 1,Great site 1,\nSite 1,Great site 2,\n"
227225
)
228226

229227
with auth_context:

‎tests/resources/test_timeseries_data.py‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def test_timeseries_data_stats(
5757
ts_l = (ts_1_id,)
5858
else:
5959
query_url = f"{TIMESERIES_DATA_URL}campaign/{campaign_1_id}/stats"
60-
ts_l = (f"Timeseries {ts_1_id-1}",)
60+
ts_l = (f"Timeseries {ts_1_id - 1}",)
6161

6262
ret = client.get(
6363
query_url,
@@ -89,7 +89,7 @@ def test_timeseries_data_stats(
8989
ts_l = (ts_2_id,)
9090
else:
9191
query_url = f"{TIMESERIES_DATA_URL}campaign/{campaign_2_id}/stats"
92-
ts_l = (f"Timeseries {ts_2_id-1}",)
92+
ts_l = (f"Timeseries {ts_2_id - 1}",)
9393

9494
ret = client.get(
9595
query_url,
@@ -129,7 +129,7 @@ def test_timeseries_data_stats_no_data(
129129
ts_l = (ts_1_id,)
130130
else:
131131
query_url = f"{TIMESERIES_DATA_URL}campaign/{campaign_1_id}/stats"
132-
ts_l = (f"Timeseries {ts_1_id-1}",)
132+
ts_l = (f"Timeseries {ts_1_id - 1}",)
133133

134134
ret = client.get(
135135
query_url,
@@ -199,7 +199,7 @@ def test_timeseries_data_get(
199199
ret_line_1 = "Datetime,1"
200200
else:
201201
query_url = TIMESERIES_DATA_URL + f"campaign/{campaign_1_id}/"
202-
ts_l = (f"Timeseries {ts_1_id-1}",)
202+
ts_l = (f"Timeseries {ts_1_id - 1}",)
203203
ret_line_1 = "Datetime,Timeseries 0"
204204

205205
ret = client.get(
@@ -366,7 +366,7 @@ def test_timeseries_data_get(
366366
ret_line_1 = "Datetime,2"
367367
else:
368368
query_url = TIMESERIES_DATA_URL + f"campaign/{campaign_2_id}/"
369-
ts_l = (f"Timeseries {ts_2_id-1}",)
369+
ts_l = (f"Timeseries {ts_2_id - 1}",)
370370
ret_line_1 = "Datetime,Timeseries 1"
371371

372372
ret = client.get(
@@ -475,7 +475,7 @@ def test_timeseries_data_get_aggregate(
475475
ret_line_1 = "Datetime,1"
476476
else:
477477
query_url = TIMESERIES_DATA_URL + f"campaign/{campaign_1_id}/"
478-
ts_l = (f"Timeseries {ts_1_id-1}",)
478+
ts_l = (f"Timeseries {ts_1_id - 1}",)
479479
ret_line_1 = "Datetime,Timeseries 0"
480480

481481
ret = client.get(
@@ -512,7 +512,7 @@ def test_timeseries_data_get_aggregate(
512512
ret_line_1 = "Datetime,1"
513513
else:
514514
query_url = TIMESERIES_DATA_URL + f"campaign/{campaign_1_id}/"
515-
ts_l = (f"Timeseries {ts_1_id-1}",)
515+
ts_l = (f"Timeseries {ts_1_id - 1}",)
516516
ret_line_1 = "Datetime,Timeseries 0"
517517

518518
ret = client.get(
@@ -546,7 +546,7 @@ def test_timeseries_data_get_aggregate(
546546
ret_line_1 = "Datetime,1"
547547
else:
548548
query_url = TIMESERIES_DATA_URL + f"campaign/{campaign_1_id}/"
549-
ts_l = (f"Timeseries {ts_1_id-1}",)
549+
ts_l = (f"Timeseries {ts_1_id - 1}",)
550550
ret_line_1 = "Datetime,Timeseries 0"
551551

552552
ret = client.get(
@@ -583,7 +583,7 @@ def test_timeseries_data_get_aggregate(
583583
ret_line_1 = "Datetime,1"
584584
else:
585585
query_url = TIMESERIES_DATA_URL + f"campaign/{campaign_1_id}/"
586-
ts_l = (f"Timeseries {ts_1_id-1}",)
586+
ts_l = (f"Timeseries {ts_1_id - 1}",)
587587
ret_line_1 = "Datetime,Timeseries 0"
588588

589589
ret = client.get(
@@ -620,7 +620,7 @@ def test_timeseries_data_get_aggregate(
620620
ret_line_1 = "Datetime,2"
621621
else:
622622
query_url = TIMESERIES_DATA_URL + f"campaign/{campaign_2_id}/"
623-
ts_l = (f"Timeseries {ts_2_id-1}",)
623+
ts_l = (f"Timeseries {ts_2_id - 1}",)
624624
ret_line_1 = "Datetime,Timeseries 1"
625625

626626
ret = client.get(
@@ -694,7 +694,7 @@ def test_timeseries_data_get_aggregate_errors(
694694
# Unknown campaign
695695
if for_campaign:
696696
query_url = TIMESERIES_DATA_URL + f"campaign/{DUMMY_ID}/"
697-
ts_l = (f"Timeseries {ts_1_id-1}",)
697+
ts_l = (f"Timeseries {ts_1_id - 1}",)
698698

699699
ret = client.get(
700700
f"{query_url}aggregate",
@@ -715,7 +715,7 @@ def test_timeseries_data_get_aggregate_errors(
715715
ts_l = (ts_1_id,)
716716
else:
717717
query_url = TIMESERIES_DATA_URL + f"campaign/{campaign_1_id}/"
718-
ts_l = (f"Timeseries {ts_1_id-1}",)
718+
ts_l = (f"Timeseries {ts_1_id - 1}",)
719719

720720
ret = client.get(
721721
f"{query_url}aggregate",
@@ -759,7 +759,7 @@ def test_timeseries_data_get_aggregate_errors(
759759
ts_l = (ts_1_id,)
760760
else:
761761
query_url = TIMESERIES_DATA_URL + f"campaign/{campaign_1_id}/"
762-
ts_l = (f"Timeseries {ts_1_id-1}",)
762+
ts_l = (f"Timeseries {ts_1_id - 1}",)
763763

764764
ret = client.get(
765765
f"{query_url}aggregate",
@@ -796,7 +796,7 @@ def test_timeseries_data_get_aggregate_errors(
796796
ts_l = (ts_1_id,)
797797
else:
798798
query_url = TIMESERIES_DATA_URL + f"campaign/{campaign_1_id}/"
799-
ts_l = (f"Timeseries {ts_1_id-1}",)
799+
ts_l = (f"Timeseries {ts_1_id - 1}",)
800800

801801
ret = client.get(
802802
f"{query_url}aggregate",
@@ -818,7 +818,7 @@ def test_timeseries_data_get_aggregate_errors(
818818
ts_l = (ts_1_id,)
819819
else:
820820
query_url = TIMESERIES_DATA_URL + f"campaign/{campaign_1_id}/"
821-
ts_l = (f"Timeseries {ts_1_id-1}",)
821+
ts_l = (f"Timeseries {ts_1_id - 1}",)
822822

823823
ret = client.get(
824824
f"{query_url}aggregate",
@@ -840,7 +840,7 @@ def test_timeseries_data_get_aggregate_errors(
840840
ts_l = (ts_1_id,)
841841
else:
842842
query_url = TIMESERIES_DATA_URL + f"campaign/{campaign_1_id}/"
843-
ts_l = (f"Timeseries {ts_1_id-1}",)
843+
ts_l = (f"Timeseries {ts_1_id - 1}",)
844844

845845
ret = client.get(
846846
f"{query_url}aggregate",
@@ -890,8 +890,8 @@ def test_timeseries_data_post(
890890
ts_l = (ts_1_id,)
891891
else:
892892
query_url = TIMESERIES_DATA_URL + f"campaign/{campaign_1_id}/"
893-
header = f"Datetime,Timeseries {ts_1_id-1}\n"
894-
ts_l = (f"Timeseries {ts_1_id-1}",)
893+
header = f"Datetime,Timeseries {ts_1_id - 1}\n"
894+
ts_l = (f"Timeseries {ts_1_id - 1}",)
895895

896896
if mime_type == "text/csv":
897897
kwargs = {
@@ -944,8 +944,8 @@ def test_timeseries_data_post(
944944
ts_l = (ts_2_id,)
945945
else:
946946
query_url = TIMESERIES_DATA_URL + f"campaign/{campaign_2_id}/"
947-
header = f"Datetime,Timeseries {ts_2_id-1}\n"
948-
ts_l = (f"Timeseries {ts_2_id-1}",)
947+
header = f"Datetime,Timeseries {ts_2_id - 1}\n"
948+
ts_l = (f"Timeseries {ts_2_id - 1}",)
949949

950950
if mime_type == "text/csv":
951951
kwargs = {
@@ -1010,8 +1010,8 @@ def test_timeseries_data_post_errors(
10101010
# Unknown campaign
10111011
if for_campaign:
10121012
query_url = TIMESERIES_DATA_URL + f"campaign/{DUMMY_ID}/"
1013-
header = f"Datetime,Timeseries {ts_1_id-1}\n"
1014-
ts_l = (f"Timeseries {ts_1_id-1}",)
1013+
header = f"Datetime,Timeseries {ts_1_id - 1}\n"
1014+
ts_l = (f"Timeseries {ts_1_id - 1}",)
10151015
if mime_type == "text/csv":
10161016
kwargs = {"data": header + "2020-01-01T00:00:00+00:00,0\n"}
10171017
else:
@@ -1033,8 +1033,8 @@ def test_timeseries_data_post_errors(
10331033
ts_l = (ts_1_id,)
10341034
else:
10351035
query_url = TIMESERIES_DATA_URL + f"campaign/{campaign_1_id}/"
1036-
header = f"Datetime,Timeseries {ts_1_id-1}\n"
1037-
ts_l = (f"Timeseries {ts_1_id-1}",)
1036+
header = f"Datetime,Timeseries {ts_1_id - 1}\n"
1037+
ts_l = (f"Timeseries {ts_1_id - 1}",)
10381038
if mime_type == "text/csv":
10391039
kwargs = {"data": header + "2020-01-01T00:00:00+00:00,0\n"}
10401040
else:
@@ -1186,7 +1186,7 @@ def test_timeseries_data_delete(
11861186
ts_l = (ts_1_id,)
11871187
else:
11881188
query_url = TIMESERIES_DATA_URL + f"campaign/{campaign_1_id}/"
1189-
ts_l = (f"Timeseries {ts_1_id-1}",)
1189+
ts_l = (f"Timeseries {ts_1_id - 1}",)
11901190

11911191
if user == "admin":
11921192
# Check there is data before deleting
@@ -1234,7 +1234,7 @@ def test_timeseries_data_delete(
12341234
ts_l = (ts_2_id,)
12351235
else:
12361236
query_url = TIMESERIES_DATA_URL + f"campaign/{campaign_2_id}/"
1237-
ts_l = (f"Timeseries {ts_2_id-1}",)
1237+
ts_l = (f"Timeseries {ts_2_id - 1}",)
12381238

12391239
if user == "admin":
12401240
# Check there is data before deleting
@@ -1303,7 +1303,7 @@ def test_timeseries_data_delete_errors(
13031303
# Unknown campaign
13041304
if for_campaign:
13051305
query_url = TIMESERIES_DATA_URL + f"campaign/{DUMMY_ID}/"
1306-
ts_l = (f"Timeseries {ts_1_id-1}",)
1306+
ts_l = (f"Timeseries {ts_1_id - 1}",)
13071307

13081308
ret = client_method(
13091309
query_url,
@@ -1323,7 +1323,7 @@ def test_timeseries_data_delete_errors(
13231323
ts_l = (ts_1_id,)
13241324
else:
13251325
query_url = TIMESERIES_DATA_URL + f"campaign/{campaign_1_id}/"
1326-
ts_l = (f"Timeseries {ts_1_id-1}",)
1326+
ts_l = (f"Timeseries {ts_1_id - 1}",)
13271327

13281328
ret = client_method(
13291329
query_url,

0 commit comments

Comments
 (0)