Chore: Format code using black and isort

Author: amotl

Makefile

@@ -53,7 +53,7 @@ test-coverage: install-tests
 # Formatting
 # ----------
 format: install-releasetools
-	$(isort) .
+	$(isort) grafana_wtf test
 	$(black) .
 
 

grafana_wtf/commands.py

@@ -10,9 +10,13 @@
 
 from grafana_wtf import __appname__, __version__
 from grafana_wtf.core import GrafanaWtf
-from grafana_wtf.report.data import output_results, DataSearchReport
+from grafana_wtf.report.data import DataSearchReport, output_results
+from grafana_wtf.report.tabular import (
+    TabularEditHistoryReport,
+    TabularSearchReport,
+    get_table_format,
+)
 from grafana_wtf.report.textual import TextualSearchReport
-from grafana_wtf.report.tabular import TabularSearchReport, get_table_format, TabularEditHistoryReport
 from grafana_wtf.util import (
     configure_http_logging,
     filter_with_sql,
@@ -225,7 +229,6 @@ def run():
     output_format = options["format"]
 
     if options.find or options.replace:
-
         if options.select_dashboard:
             # Restrict scan to list of dashboards.
             dashboard_uids = read_list(options.select_dashboard)
@@ -253,7 +256,6 @@ def run():
         engine.clear_cache()
 
     if options.log:
-
         # Sanity checks.
         if output_format.startswith("tab") and options.sql:
             raise DocoptExit(
@@ -294,7 +296,6 @@ def run():
             output_results(output_format, entries)
 
     if options.explore and options.datasources:
-
         results = engine.explore_datasources()
 
         unused_count = len(results["unused"])

grafana_wtf/report/data.py

@@ -15,7 +15,6 @@ def output_results(output_format: str, results: List):
 
 
 def serialize_results(output_format: str, results: List):
-
     if output_format == "json":
         output = json.dumps(results, indent=4)
 

grafana_wtf/report/tabular.py

@@ -81,7 +81,6 @@ def get_datasources(self, item):
 
 
 class TabularEditHistoryReport:
-
     def __init__(self, data):
         self.data = data
 

grafana_wtf/util.py

@@ -196,8 +196,9 @@ def filter_with_sql(data: trecord, view_name: str, expression: str) -> trecord:
     :param view_name: View name the data is registered at, when querying per SQL.
     :return:
     """
-    import pandas as pd
     import duckdb
+    import pandas as pd
+
     df = pd.DataFrame.from_records(data)
     duckdb.register(view_name, df)
     results = duckdb.sql(expression)

tests/test_commands.py

@@ -233,7 +233,6 @@ def test_log_empty(docker_grafana, capsys, caplog):
 
 
 def test_log_all(ldi_resources, capsys, caplog):
-
     # Only provision specific dashboard(s).
     ldi_resources(dashboards=["tests/grafana/dashboards/ldi-v27.json", "tests/grafana/dashboards/ldi-v33.json"])
 
@@ -244,7 +243,7 @@ def test_log_all(ldi_resources, capsys, caplog):
     captured = capsys.readouterr()
 
     # Verify output.
-    assert 'Aggregating edit history for multiple Grafana dashboards' in caplog.text
+    assert "Aggregating edit history for multiple Grafana dashboards" in caplog.text
     history = json.loads(captured.out)
     assert len(history) == 3
 
@@ -324,13 +323,15 @@ def test_log_filter_sql(ldi_resources, capsys, caplog):
     ldi_resources(dashboards=["tests/grafana/dashboards/ldi-v27.json", "tests/grafana/dashboards/ldi-v33.json"])
 
     # Run command and capture output.
-    set_command("""log --format=yaml --sql='
+    set_command(
+        """log --format=yaml --sql='
         SELECT url
         FROM dashboard_versions
         GROUP BY uid, url
         HAVING COUNT(version)=1
     '
-    """)
+    """
+    )
     with caplog.at_level(logging.DEBUG):
         grafana_wtf.commands.run()
     captured = capsys.readouterr()
@@ -488,10 +489,12 @@ def test_explore_dashboards_data_details(ldi_resources, capsys, caplog):
     assert dashboard.details.targets[0]._panel.type == "graph"
     assert dashboard.details.targets[0]._panel.datasource.type == "influxdb"
     assert dashboard.details.targets[0]._panel.datasource.uid == "PDF2762CDFF14A314"
-    assert dashboard.details.targets[0].fields == [{'func': 'mean', 'name': 'P1'}]
-    assert dashboard.details.templating[0].query == \
-           "SELECT osm_country_code AS __value, country_and_countrycode AS __text " \
-           "FROM ldi_network ORDER BY osm_country_code"
+    assert dashboard.details.targets[0].fields == [{"func": "mean", "name": "P1"}]
+    assert (
+        dashboard.details.templating[0].query
+        == "SELECT osm_country_code AS __value, country_and_countrycode AS __text "
+        "FROM ldi_network ORDER BY osm_country_code"
+    )
 
 
 def test_explore_dashboards_empty_annotations(grafana_version, create_datasource, create_dashboard, capsys, caplog):