Skip to content

Commit b19a989

Browse files
jpmckinneyjpmckinney
committed
chore: Remove extra newlines
1 parent 8f601d7 commit b19a989

14 files changed

+5
-134
lines changed

‎component_check_conformance.ipynb

-7
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@
9898
"outputs": [],
9999
"source": [
100100
"%%sql ocid_prefix_release_check <<\n",
101-
"\n",
102101
"SELECT ocid\n",
103102
"FROM\n",
104103
" release_summary\n",
@@ -138,7 +137,6 @@
138137
"outputs": [],
139138
"source": [
140139
"%%sql ocid_prefix_record_check <<\n",
141-
"\n",
142140
"SELECT ocid\n",
143141
"FROM\n",
144142
" record_summary\n",
@@ -197,7 +195,6 @@
197195
},
198196
"source": [
199197
"%%sql\n",
200-
"\n",
201198
"SELECT\n",
202199
" collection_id,\n",
203200
" release_type,\n",
@@ -271,7 +268,6 @@
271268
},
272269
"source": [
273270
"%%sql\n",
274-
"\n",
275271
"WITH check_results AS (\n",
276272
" SELECT\n",
277273
" *,\n",
@@ -384,7 +380,6 @@
384380
},
385381
"source": [
386382
"%%sql additional_field_examples <<\n",
387-
"\n",
388383
"WITH additional_field_releases AS (\n",
389384
" SELECT\n",
390385
" ocid,\n",
@@ -479,7 +474,6 @@
479474
},
480475
"source": [
481476
"%%sql\n",
482-
"\n",
483477
"WITH check_results AS (\n",
484478
" SELECT\n",
485479
" *,\n",
@@ -560,7 +554,6 @@
560554
},
561555
"source": [
562556
"%%sql\n",
563-
"\n",
564557
"SELECT DISTINCT ON (collection_id, path, deprecated_version, explanation)\n",
565558
" collection_id,\n",
566559
" regexp_replace(trim('\"' FROM paths::text), '\\/[0-9]+', '', 'g')\n",

‎component_check_quality.ipynb

-19
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@
7979
},
8080
"source": [
8181
"%%sql\n",
82-
"\n",
8382
"SELECT\n",
8483
" collection_id,\n",
8584
" release_type,\n",
@@ -145,7 +144,6 @@
145144
},
146145
"source": [
147146
"%%sql release_tag_section_summary <<\n",
148-
"\n",
149147
"WITH contract_implementation AS (\n",
150148
" SELECT\n",
151149
" cs.collection_id,\n",
@@ -239,7 +237,6 @@
239237
},
240238
"source": [
241239
"%%sql\n",
242-
"\n",
243240
"WITH date_frequency AS (\n",
244241
" SELECT\n",
245242
" collection_id,\n",
@@ -313,7 +310,6 @@
313310
},
314311
"source": [
315312
"%%sql\n",
316-
"\n",
317313
"SELECT DISTINCT ON (\n",
318314
" collection_id, release_type,\n",
319315
" language)\n",
@@ -399,7 +395,6 @@
399395
},
400396
"source": [
401397
"%%sql\n",
402-
"\n",
403398
"WITH release_counts AS (\n",
404399
" SELECT\n",
405400
" collection_id,\n",
@@ -448,7 +443,6 @@
448443
},
449444
"source": [
450445
"%%sql release_count_summary <<\n",
451-
"\n",
452446
"WITH release_counts AS (\n",
453447
" SELECT\n",
454448
" collection_id,\n",
@@ -508,7 +502,6 @@
508502
},
509503
"source": [
510504
"%%sql release_counts <<\n",
511-
"\n",
512505
"WITH release_counts AS (\n",
513506
" SELECT\n",
514507
" collection_id,\n",
@@ -575,7 +568,6 @@
575568
},
576569
"source": [
577570
"%%sql multiple_release_examples <<\n",
578-
"\n",
579571
"WITH ranked_ocids AS (\n",
580572
" SELECT\n",
581573
" collection_id,\n",
@@ -686,7 +678,6 @@
686678
},
687679
"source": [
688680
"%%sql\n",
689-
"\n",
690681
"SELECT\n",
691682
" collection_id,\n",
692683
" release_type,\n",
@@ -720,7 +711,6 @@
720711
},
721712
"source": [
722713
"%%sql\n",
723-
"\n",
724714
"SELECT\n",
725715
" ocid,\n",
726716
" release_id,\n",
@@ -754,7 +744,6 @@
754744
},
755745
"source": [
756746
"%%sql duplicate_release_ids <<\n",
757-
"\n",
758747
"WITH release_ids AS (\n",
759748
" SELECT\n",
760749
" collection_id,\n",
@@ -859,7 +848,6 @@
859848
},
860849
"source": [
861850
"%%sql\n",
862-
"\n",
863851
"SELECT\n",
864852
" contracts_summary.collection_id,\n",
865853
" contracts_summary.release_type,\n",
@@ -930,7 +918,6 @@
930918
},
931919
"source": [
932920
"%%sql\n",
933-
"\n",
934921
"SELECT\n",
935922
" tender_summary.collection_id,\n",
936923
" tender_summary.release_type,\n",
@@ -994,7 +981,6 @@
994981
},
995982
"source": [
996983
"%%sql example_releases <<\n",
997-
"\n",
998984
"WITH examples AS (\n",
999985
" SELECT DISTINCT ON (\n",
1000986
" collection_id,\n",
@@ -1081,7 +1067,6 @@
10811067
},
10821068
"source": [
10831069
"%%sql organization_identifiers <<\n",
1084-
"\n",
10851070
"SELECT\n",
10861071
" collection_id,\n",
10871072
" release_type,\n",
@@ -1149,7 +1134,6 @@
11491134
},
11501135
"source": [
11511136
"%%sql\n",
1152-
"\n",
11531137
"WITH documents AS (\n",
11541138
" SELECT\n",
11551139
" collection_id,\n",
@@ -1273,7 +1257,6 @@
12731257
},
12741258
"source": [
12751259
"%%sql\n",
1276-
"\n",
12771260
"SELECT\n",
12781261
" collection_id,\n",
12791262
" release_type,\n",
@@ -1369,7 +1352,6 @@
13691352
},
13701353
"source": [
13711354
"%%sql\n",
1372-
"\n",
13731355
"SELECT\n",
13741356
" collection_id,\n",
13751357
" release_type,\n",
@@ -1463,7 +1445,6 @@
14631445
"cell_type": "code",
14641446
"source": [
14651447
"%%sql\n",
1466-
"\n",
14671448
"SELECT\n",
14681449
" ocid,\n",
14691450
" count(DISTINCT data -> 'tender' ->> 'id') AS cnt\n",

‎component_check_structure.ipynb

-3
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@
6161
},
6262
"source": [
6363
"%%sql\n",
64-
"\n",
6564
"SELECT\n",
6665
" collection_id,\n",
6766
" 'release' AS collection_type,\n",
@@ -138,7 +137,6 @@
138137
},
139138
"source": [
140139
"%%sql structure_and_format_error_summary <<\n",
141-
"\n",
142140
"WITH errors AS (\n",
143141
" SELECT\n",
144142
" collection_id,\n",
@@ -272,7 +270,6 @@
272270
},
273271
"source": [
274272
"%%sql structure_and_format_errors <<\n",
275-
"\n",
276273
"SELECT\n",
277274
" collection_id,\n",
278275
" 'release' AS collection_type,\n",

‎component_errors_kingfisher.ipynb

-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@
7373
},
7474
"source": [
7575
"%%sql\n",
76-
"\n",
7776
"SELECT\n",
7877
" collection_id,\n",
7978
" code,\n",

‎component_scope_kingfisher.ipynb

-6
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@
6969
},
7070
"source": [
7171
"%%sql\n",
72-
"\n",
7372
"SELECT\n",
7473
" id AS collection_id,\n",
7574
" cached_releases_count AS releases_count,\n",
@@ -135,7 +134,6 @@
135134
},
136135
"source": [
137136
"%%sql\n",
138-
"\n",
139137
"SELECT\n",
140138
" collection_id,\n",
141139
" release_type,\n",
@@ -187,7 +185,6 @@
187185
},
188186
"source": [
189187
"%%sql objects_per_stage <<\n",
190-
"\n",
191188
"SELECT\n",
192189
" CASE\n",
193190
" WHEN paths.path = 'contracts/implementation'\n",
@@ -281,7 +278,6 @@
281278
},
282279
"source": [
283280
"%%sql\n",
284-
"\n",
285281
"SELECT\n",
286282
" collection_id,\n",
287283
" release_type,\n",
@@ -354,7 +350,6 @@
354350
},
355351
"source": [
356352
"%%sql release_dates <<\n",
357-
"\n",
358353
"SELECT\n",
359354
" collection_id::text,\n",
360355
" release_type,\n",
@@ -425,7 +420,6 @@
425420
},
426421
"source": [
427422
"%%sql\n",
428-
"\n",
429423
"SELECT\n",
430424
" collection_id,\n",
431425
" release_type,\n",

‎component_scope_usability.ipynb

-6
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
"cell_type": "code",
5353
"source": [
5454
"%%sql fields_table <<\n",
55-
"\n",
5655
"SELECT\n",
5756
" path,\n",
5857
" distinct_releases\n",
@@ -111,7 +110,6 @@
111110
"cell_type": "code",
112111
"source": [
113112
"%%sql stages <<\n",
114-
"\n",
115113
"WITH field_counts AS (\n",
116114
" SELECT *\n",
117115
" FROM\n",
@@ -198,7 +196,6 @@
198196
"cell_type": "code",
199197
"source": [
200198
"%%sql dates <<\n",
201-
"\n",
202199
"WITH tenders AS (\n",
203200
" SELECT\n",
204201
" extract(YEAR FROM tenderperiod_startdate) AS year,\n",
@@ -276,7 +273,6 @@
276273
"cell_type": "code",
277274
"source": [
278275
"%%sql\n",
279-
"\n",
280276
"SELECT\n",
281277
" procurementmethod,\n",
282278
" count(DISTINCT ocid),\n",
@@ -300,7 +296,6 @@
300296
"cell_type": "code",
301297
"source": [
302298
"%%sql\n",
303-
"\n",
304299
"SELECT\n",
305300
" tender ->> 'procurementMethodDetails' AS method,\n",
306301
" count(DISTINCT ocid),\n",
@@ -333,7 +328,6 @@
333328
"cell_type": "code",
334329
"source": [
335330
"%%sql buyers <<\n",
336-
"\n",
337331
"SELECT\n",
338332
" identifier AS party_id,\n",
339333
" party -> 'name' AS name,\n",

‎component_setup_kingfisher.ipynb

-1
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,6 @@
186186
},
187187
"source": [
188188
"%%sql\n",
189-
"\n",
190189
"SELECT\n",
191190
" summaries.selected_collections.*,\n",
192191
" source_id\n",

‎manage.py

+5-2
Original file line numberDiff line numberDiff line change
@@ -139,11 +139,13 @@ def pre_commit(filename):
139139
continue
140140

141141
source = cell["source"]
142+
143+
# In our notebooks, this is always on its own line: %%sql(?!( \w+ <<)?\\n",)
142144
if "%%sql" not in source[0]:
143145
continue
144146

145147
fix = sqlfluff.fix("".join(source[1:]), config=FLUFF_CONFIG)
146-
cell["source"] = [source[0], "\n", *fix.splitlines(keepends=True)]
148+
cell["source"] = [source[0], *fix.splitlines(keepends=True)]
147149

148150
warnings = sqlfluff.lint(fix, config=FLUFF_CONFIG)
149151
nonzero |= bool(warnings)
@@ -159,6 +161,7 @@ def pre_commit(filename):
159161
for slug, components in NOTEBOOKS.items():
160162
if any(path.stem in components for path in filenames):
161163
template_path = Path(f"{slug}.ipynb")
164+
162165
with template_path.open("w", encoding="utf8") as f:
163166
try:
164167
notebook = merge_notebooks(BASEDIR, [f"{c}.ipynb" for c in NOTEBOOKS[slug]], verbose=False)
@@ -173,7 +176,7 @@ def pre_commit(filename):
173176
json_dump(template_path, json_load(template_path))
174177

175178
if nonzero:
176-
raise click.Abort("error")
179+
raise click.Abort
177180

178181

179182
if __name__ == "__main__":

0 commit comments

Comments
 (0)