From 059989bbbeee3ac244f9110bd5bbe0a19d496acd Mon Sep 17 00:00:00 2001 From: Yohanna Lisnichuk Date: Sat, 10 Feb 2024 14:22:59 -0300 Subject: [PATCH] lint --- component_charts.ipynb | 28 ++++++++------------ template_data_quality_feedback.ipynb | 28 ++++++++------------ template_publisher_analysis.ipynb | 28 ++++++++------------ template_structure_and_format_feedback.ipynb | 28 ++++++++------------ template_usability_checks.ipynb | 28 ++++++++------------ template_usability_checks_fieldlist.ipynb | 28 ++++++++------------ template_usability_checks_registry.ipynb | 28 ++++++++------------ 7 files changed, 77 insertions(+), 119 deletions(-) diff --git a/component_charts.ipynb b/component_charts.ipynb index 72d8adb..26faec9 100644 --- a/component_charts.ipynb +++ b/component_charts.ipynb @@ -59,11 +59,11 @@ "\n", "def plot_release_count(release_counts):\n", " # check if input contains the right columns\n", - " if not set([\"collection_id\", \"release_type\", \"release_count\", \"ocid_count\"]).issubset(release_counts.columns):\n", + " if not {\"collection_id\", \"release_type\", \"release_count\", \"ocid_count\"}.issubset(release_counts.columns):\n", " raise ValueError(\n", " \"Input data must contain the following columns: collection_id, release_type, release_count, ocid_count\"\n", " )\n", - " chart = (\n", + " return (\n", " alt.Chart(release_counts)\n", " .mark_bar()\n", " .encode(\n", @@ -106,15 +106,13 @@ " .configure_view(strokeWidth=0)\n", " )\n", "\n", - " return chart\n", - "\n", "\n", "def plot_objects_per_stage(objects_per_stage):\n", " # check if input contains the right columns\n", - " if not set([\"stage\", \"object_count\"]).issubset(objects_per_stage.columns):\n", + " if not {\"stage\", \"object_count\"}.issubset(objects_per_stage.columns):\n", " raise ValueError(\"Data must contain columns 'stage' and 'object_count'\")\n", " # draw chart\n", - " chart = (\n", + " return (\n", " alt.Chart(objects_per_stage)\n", " .mark_bar(fill=\"#d6e100\")\n", " .encode(\n", @@ -158,19 +156,18 @@ " )\n", " .configure_view(strokeWidth=0)\n", " )\n", - " return chart\n", "\n", "\n", "def plot_releases_by_month(release_dates):\n", " # check if input contains the right columns\n", - " if not set([\"date\", \"collection_id\", \"release_type\", \"release_count\"]).issubset(release_dates.columns):\n", + " if not {\"date\", \"collection_id\", \"release_type\", \"release_count\"}.issubset(release_dates.columns):\n", " raise ValueError(\"Data must contain columns 'date', 'collection_id', 'release_type', 'release_count'\")\n", " # check if number of rows is more than 5000\n", " if release_dates.shape[0] > 5000:\n", " alt.data_transformers.disable_max_rows()\n", "\n", " # draw chart\n", - " chart = (\n", + " return (\n", " alt.Chart(release_dates)\n", " .mark_line(strokeWidth=3)\n", " .encode(\n", @@ -209,15 +206,14 @@ " )\n", " .configure_view(strokeWidth=0)\n", " )\n", - " return chart\n", "\n", "\n", "def plot_objects_per_year(objects_per_year):\n", " # check if input contains the right columns\n", - " if not set([\"year\", \"tenders\", \"awards\"]).issubset(objects_per_year.columns):\n", + " if not {\"year\", \"tenders\", \"awards\"}.issubset(objects_per_year.columns):\n", " raise ValueError(\"Data must contain columns 'year', 'tenders' and 'awards'\")\n", " # draw chart\n", - " chart = (\n", + " return (\n", " alt.Chart(objects_per_year)\n", " .transform_fold([\"tenders\", \"awards\"])\n", " .mark_line(strokeWidth=3)\n", @@ -260,15 +256,14 @@ " )\n", " .configure_view(strokeWidth=0)\n", " )\n", - " return chart\n", "\n", "\n", "def plot_top_buyers(buyers):\n", " # check if input contains the right columns\n", - " if not set([\"name\", \"total_tenders\"]).issubset(buyers.columns):\n", + " if not {\"name\", \"total_tenders\"}.issubset(buyers.columns):\n", " raise ValueError(\"Data must contain columns 'name' and 'total_tenders'\")\n", " # draw chart\n", - " chart = (\n", + " return (\n", " alt.Chart(buyers)\n", " .mark_bar(fill=\"#d6e100\")\n", " .encode(\n", @@ -302,8 +297,7 @@ " domain=False,\n", " )\n", " .configure_view(strokeWidth=0)\n", - " )\n", - " return chart" + " )\n" ], "metadata": { "id": "Bip37aP917XY" diff --git a/template_data_quality_feedback.ipynb b/template_data_quality_feedback.ipynb index b7a21c3..850881b 100644 --- a/template_data_quality_feedback.ipynb +++ b/template_data_quality_feedback.ipynb @@ -179,11 +179,11 @@ "\n", "def plot_release_count(release_counts):\n", " # check if input contains the right columns\n", - " if not set([\"collection_id\", \"release_type\", \"release_count\", \"ocid_count\"]).issubset(release_counts.columns):\n", + " if not {\"collection_id\", \"release_type\", \"release_count\", \"ocid_count\"}.issubset(release_counts.columns):\n", " raise ValueError(\n", " \"Input data must contain the following columns: collection_id, release_type, release_count, ocid_count\"\n", " )\n", - " chart = (\n", + " return (\n", " alt.Chart(release_counts)\n", " .mark_bar()\n", " .encode(\n", @@ -226,15 +226,13 @@ " .configure_view(strokeWidth=0)\n", " )\n", "\n", - " return chart\n", - "\n", "\n", "def plot_objects_per_stage(objects_per_stage):\n", " # check if input contains the right columns\n", - " if not set([\"stage\", \"object_count\"]).issubset(objects_per_stage.columns):\n", + " if not {\"stage\", \"object_count\"}.issubset(objects_per_stage.columns):\n", " raise ValueError(\"Data must contain columns 'stage' and 'object_count'\")\n", " # draw chart\n", - " chart = (\n", + " return (\n", " alt.Chart(objects_per_stage)\n", " .mark_bar(fill=\"#d6e100\")\n", " .encode(\n", @@ -278,19 +276,18 @@ " )\n", " .configure_view(strokeWidth=0)\n", " )\n", - " return chart\n", "\n", "\n", "def plot_releases_by_month(release_dates):\n", " # check if input contains the right columns\n", - " if not set([\"date\", \"collection_id\", \"release_type\", \"release_count\"]).issubset(release_dates.columns):\n", + " if not {\"date\", \"collection_id\", \"release_type\", \"release_count\"}.issubset(release_dates.columns):\n", " raise ValueError(\"Data must contain columns 'date', 'collection_id', 'release_type', 'release_count'\")\n", " # check if number of rows is more than 5000\n", " if release_dates.shape[0] > 5000:\n", " alt.data_transformers.disable_max_rows()\n", "\n", " # draw chart\n", - " chart = (\n", + " return (\n", " alt.Chart(release_dates)\n", " .mark_line(strokeWidth=3)\n", " .encode(\n", @@ -329,15 +326,14 @@ " )\n", " .configure_view(strokeWidth=0)\n", " )\n", - " return chart\n", "\n", "\n", "def plot_objects_per_year(objects_per_year):\n", " # check if input contains the right columns\n", - " if not set([\"year\", \"tenders\", \"awards\"]).issubset(objects_per_year.columns):\n", + " if not {\"year\", \"tenders\", \"awards\"}.issubset(objects_per_year.columns):\n", " raise ValueError(\"Data must contain columns 'year', 'tenders' and 'awards'\")\n", " # draw chart\n", - " chart = (\n", + " return (\n", " alt.Chart(objects_per_year)\n", " .transform_fold([\"tenders\", \"awards\"])\n", " .mark_line(strokeWidth=3)\n", @@ -380,15 +376,14 @@ " )\n", " .configure_view(strokeWidth=0)\n", " )\n", - " return chart\n", "\n", "\n", "def plot_top_buyers(buyers):\n", " # check if input contains the right columns\n", - " if not set([\"name\", \"total_tenders\"]).issubset(buyers.columns):\n", + " if not {\"name\", \"total_tenders\"}.issubset(buyers.columns):\n", " raise ValueError(\"Data must contain columns 'name' and 'total_tenders'\")\n", " # draw chart\n", - " chart = (\n", + " return (\n", " alt.Chart(buyers)\n", " .mark_bar(fill=\"#d6e100\")\n", " .encode(\n", @@ -422,8 +417,7 @@ " domain=False,\n", " )\n", " .configure_view(strokeWidth=0)\n", - " )\n", - " return chart" + " )\n" ] }, { diff --git a/template_publisher_analysis.ipynb b/template_publisher_analysis.ipynb index d9d640c..6316e3d 100644 --- a/template_publisher_analysis.ipynb +++ b/template_publisher_analysis.ipynb @@ -179,11 +179,11 @@ "\n", "def plot_release_count(release_counts):\n", " # check if input contains the right columns\n", - " if not set([\"collection_id\", \"release_type\", \"release_count\", \"ocid_count\"]).issubset(release_counts.columns):\n", + " if not {\"collection_id\", \"release_type\", \"release_count\", \"ocid_count\"}.issubset(release_counts.columns):\n", " raise ValueError(\n", " \"Input data must contain the following columns: collection_id, release_type, release_count, ocid_count\"\n", " )\n", - " chart = (\n", + " return (\n", " alt.Chart(release_counts)\n", " .mark_bar()\n", " .encode(\n", @@ -226,15 +226,13 @@ " .configure_view(strokeWidth=0)\n", " )\n", "\n", - " return chart\n", - "\n", "\n", "def plot_objects_per_stage(objects_per_stage):\n", " # check if input contains the right columns\n", - " if not set([\"stage\", \"object_count\"]).issubset(objects_per_stage.columns):\n", + " if not {\"stage\", \"object_count\"}.issubset(objects_per_stage.columns):\n", " raise ValueError(\"Data must contain columns 'stage' and 'object_count'\")\n", " # draw chart\n", - " chart = (\n", + " return (\n", " alt.Chart(objects_per_stage)\n", " .mark_bar(fill=\"#d6e100\")\n", " .encode(\n", @@ -278,19 +276,18 @@ " )\n", " .configure_view(strokeWidth=0)\n", " )\n", - " return chart\n", "\n", "\n", "def plot_releases_by_month(release_dates):\n", " # check if input contains the right columns\n", - " if not set([\"date\", \"collection_id\", \"release_type\", \"release_count\"]).issubset(release_dates.columns):\n", + " if not {\"date\", \"collection_id\", \"release_type\", \"release_count\"}.issubset(release_dates.columns):\n", " raise ValueError(\"Data must contain columns 'date', 'collection_id', 'release_type', 'release_count'\")\n", " # check if number of rows is more than 5000\n", " if release_dates.shape[0] > 5000:\n", " alt.data_transformers.disable_max_rows()\n", "\n", " # draw chart\n", - " chart = (\n", + " return (\n", " alt.Chart(release_dates)\n", " .mark_line(strokeWidth=3)\n", " .encode(\n", @@ -329,15 +326,14 @@ " )\n", " .configure_view(strokeWidth=0)\n", " )\n", - " return chart\n", "\n", "\n", "def plot_objects_per_year(objects_per_year):\n", " # check if input contains the right columns\n", - " if not set([\"year\", \"tenders\", \"awards\"]).issubset(objects_per_year.columns):\n", + " if not {\"year\", \"tenders\", \"awards\"}.issubset(objects_per_year.columns):\n", " raise ValueError(\"Data must contain columns 'year', 'tenders' and 'awards'\")\n", " # draw chart\n", - " chart = (\n", + " return (\n", " alt.Chart(objects_per_year)\n", " .transform_fold([\"tenders\", \"awards\"])\n", " .mark_line(strokeWidth=3)\n", @@ -380,15 +376,14 @@ " )\n", " .configure_view(strokeWidth=0)\n", " )\n", - " return chart\n", "\n", "\n", "def plot_top_buyers(buyers):\n", " # check if input contains the right columns\n", - " if not set([\"name\", \"total_tenders\"]).issubset(buyers.columns):\n", + " if not {\"name\", \"total_tenders\"}.issubset(buyers.columns):\n", " raise ValueError(\"Data must contain columns 'name' and 'total_tenders'\")\n", " # draw chart\n", - " chart = (\n", + " return (\n", " alt.Chart(buyers)\n", " .mark_bar(fill=\"#d6e100\")\n", " .encode(\n", @@ -422,8 +417,7 @@ " domain=False,\n", " )\n", " .configure_view(strokeWidth=0)\n", - " )\n", - " return chart" + " )\n" ] }, { diff --git a/template_structure_and_format_feedback.ipynb b/template_structure_and_format_feedback.ipynb index 5bb4024..bcd9b17 100644 --- a/template_structure_and_format_feedback.ipynb +++ b/template_structure_and_format_feedback.ipynb @@ -179,11 +179,11 @@ "\n", "def plot_release_count(release_counts):\n", " # check if input contains the right columns\n", - " if not set([\"collection_id\", \"release_type\", \"release_count\", \"ocid_count\"]).issubset(release_counts.columns):\n", + " if not {\"collection_id\", \"release_type\", \"release_count\", \"ocid_count\"}.issubset(release_counts.columns):\n", " raise ValueError(\n", " \"Input data must contain the following columns: collection_id, release_type, release_count, ocid_count\"\n", " )\n", - " chart = (\n", + " return (\n", " alt.Chart(release_counts)\n", " .mark_bar()\n", " .encode(\n", @@ -226,15 +226,13 @@ " .configure_view(strokeWidth=0)\n", " )\n", "\n", - " return chart\n", - "\n", "\n", "def plot_objects_per_stage(objects_per_stage):\n", " # check if input contains the right columns\n", - " if not set([\"stage\", \"object_count\"]).issubset(objects_per_stage.columns):\n", + " if not {\"stage\", \"object_count\"}.issubset(objects_per_stage.columns):\n", " raise ValueError(\"Data must contain columns 'stage' and 'object_count'\")\n", " # draw chart\n", - " chart = (\n", + " return (\n", " alt.Chart(objects_per_stage)\n", " .mark_bar(fill=\"#d6e100\")\n", " .encode(\n", @@ -278,19 +276,18 @@ " )\n", " .configure_view(strokeWidth=0)\n", " )\n", - " return chart\n", "\n", "\n", "def plot_releases_by_month(release_dates):\n", " # check if input contains the right columns\n", - " if not set([\"date\", \"collection_id\", \"release_type\", \"release_count\"]).issubset(release_dates.columns):\n", + " if not {\"date\", \"collection_id\", \"release_type\", \"release_count\"}.issubset(release_dates.columns):\n", " raise ValueError(\"Data must contain columns 'date', 'collection_id', 'release_type', 'release_count'\")\n", " # check if number of rows is more than 5000\n", " if release_dates.shape[0] > 5000:\n", " alt.data_transformers.disable_max_rows()\n", "\n", " # draw chart\n", - " chart = (\n", + " return (\n", " alt.Chart(release_dates)\n", " .mark_line(strokeWidth=3)\n", " .encode(\n", @@ -329,15 +326,14 @@ " )\n", " .configure_view(strokeWidth=0)\n", " )\n", - " return chart\n", "\n", "\n", "def plot_objects_per_year(objects_per_year):\n", " # check if input contains the right columns\n", - " if not set([\"year\", \"tenders\", \"awards\"]).issubset(objects_per_year.columns):\n", + " if not {\"year\", \"tenders\", \"awards\"}.issubset(objects_per_year.columns):\n", " raise ValueError(\"Data must contain columns 'year', 'tenders' and 'awards'\")\n", " # draw chart\n", - " chart = (\n", + " return (\n", " alt.Chart(objects_per_year)\n", " .transform_fold([\"tenders\", \"awards\"])\n", " .mark_line(strokeWidth=3)\n", @@ -380,15 +376,14 @@ " )\n", " .configure_view(strokeWidth=0)\n", " )\n", - " return chart\n", "\n", "\n", "def plot_top_buyers(buyers):\n", " # check if input contains the right columns\n", - " if not set([\"name\", \"total_tenders\"]).issubset(buyers.columns):\n", + " if not {\"name\", \"total_tenders\"}.issubset(buyers.columns):\n", " raise ValueError(\"Data must contain columns 'name' and 'total_tenders'\")\n", " # draw chart\n", - " chart = (\n", + " return (\n", " alt.Chart(buyers)\n", " .mark_bar(fill=\"#d6e100\")\n", " .encode(\n", @@ -422,8 +417,7 @@ " domain=False,\n", " )\n", " .configure_view(strokeWidth=0)\n", - " )\n", - " return chart" + " )\n" ] }, { diff --git a/template_usability_checks.ipynb b/template_usability_checks.ipynb index 76ba737..8738de2 100644 --- a/template_usability_checks.ipynb +++ b/template_usability_checks.ipynb @@ -179,11 +179,11 @@ "\n", "def plot_release_count(release_counts):\n", " # check if input contains the right columns\n", - " if not set([\"collection_id\", \"release_type\", \"release_count\", \"ocid_count\"]).issubset(release_counts.columns):\n", + " if not {\"collection_id\", \"release_type\", \"release_count\", \"ocid_count\"}.issubset(release_counts.columns):\n", " raise ValueError(\n", " \"Input data must contain the following columns: collection_id, release_type, release_count, ocid_count\"\n", " )\n", - " chart = (\n", + " return (\n", " alt.Chart(release_counts)\n", " .mark_bar()\n", " .encode(\n", @@ -226,15 +226,13 @@ " .configure_view(strokeWidth=0)\n", " )\n", "\n", - " return chart\n", - "\n", "\n", "def plot_objects_per_stage(objects_per_stage):\n", " # check if input contains the right columns\n", - " if not set([\"stage\", \"object_count\"]).issubset(objects_per_stage.columns):\n", + " if not {\"stage\", \"object_count\"}.issubset(objects_per_stage.columns):\n", " raise ValueError(\"Data must contain columns 'stage' and 'object_count'\")\n", " # draw chart\n", - " chart = (\n", + " return (\n", " alt.Chart(objects_per_stage)\n", " .mark_bar(fill=\"#d6e100\")\n", " .encode(\n", @@ -278,19 +276,18 @@ " )\n", " .configure_view(strokeWidth=0)\n", " )\n", - " return chart\n", "\n", "\n", "def plot_releases_by_month(release_dates):\n", " # check if input contains the right columns\n", - " if not set([\"date\", \"collection_id\", \"release_type\", \"release_count\"]).issubset(release_dates.columns):\n", + " if not {\"date\", \"collection_id\", \"release_type\", \"release_count\"}.issubset(release_dates.columns):\n", " raise ValueError(\"Data must contain columns 'date', 'collection_id', 'release_type', 'release_count'\")\n", " # check if number of rows is more than 5000\n", " if release_dates.shape[0] > 5000:\n", " alt.data_transformers.disable_max_rows()\n", "\n", " # draw chart\n", - " chart = (\n", + " return (\n", " alt.Chart(release_dates)\n", " .mark_line(strokeWidth=3)\n", " .encode(\n", @@ -329,15 +326,14 @@ " )\n", " .configure_view(strokeWidth=0)\n", " )\n", - " return chart\n", "\n", "\n", "def plot_objects_per_year(objects_per_year):\n", " # check if input contains the right columns\n", - " if not set([\"year\", \"tenders\", \"awards\"]).issubset(objects_per_year.columns):\n", + " if not {\"year\", \"tenders\", \"awards\"}.issubset(objects_per_year.columns):\n", " raise ValueError(\"Data must contain columns 'year', 'tenders' and 'awards'\")\n", " # draw chart\n", - " chart = (\n", + " return (\n", " alt.Chart(objects_per_year)\n", " .transform_fold([\"tenders\", \"awards\"])\n", " .mark_line(strokeWidth=3)\n", @@ -380,15 +376,14 @@ " )\n", " .configure_view(strokeWidth=0)\n", " )\n", - " return chart\n", "\n", "\n", "def plot_top_buyers(buyers):\n", " # check if input contains the right columns\n", - " if not set([\"name\", \"total_tenders\"]).issubset(buyers.columns):\n", + " if not {\"name\", \"total_tenders\"}.issubset(buyers.columns):\n", " raise ValueError(\"Data must contain columns 'name' and 'total_tenders'\")\n", " # draw chart\n", - " chart = (\n", + " return (\n", " alt.Chart(buyers)\n", " .mark_bar(fill=\"#d6e100\")\n", " .encode(\n", @@ -422,8 +417,7 @@ " domain=False,\n", " )\n", " .configure_view(strokeWidth=0)\n", - " )\n", - " return chart" + " )\n" ] }, { diff --git a/template_usability_checks_fieldlist.ipynb b/template_usability_checks_fieldlist.ipynb index fc07207..06c174e 100644 --- a/template_usability_checks_fieldlist.ipynb +++ b/template_usability_checks_fieldlist.ipynb @@ -179,11 +179,11 @@ "\n", "def plot_release_count(release_counts):\n", " # check if input contains the right columns\n", - " if not set([\"collection_id\", \"release_type\", \"release_count\", \"ocid_count\"]).issubset(release_counts.columns):\n", + " if not {\"collection_id\", \"release_type\", \"release_count\", \"ocid_count\"}.issubset(release_counts.columns):\n", " raise ValueError(\n", " \"Input data must contain the following columns: collection_id, release_type, release_count, ocid_count\"\n", " )\n", - " chart = (\n", + " return (\n", " alt.Chart(release_counts)\n", " .mark_bar()\n", " .encode(\n", @@ -226,15 +226,13 @@ " .configure_view(strokeWidth=0)\n", " )\n", "\n", - " return chart\n", - "\n", "\n", "def plot_objects_per_stage(objects_per_stage):\n", " # check if input contains the right columns\n", - " if not set([\"stage\", \"object_count\"]).issubset(objects_per_stage.columns):\n", + " if not {\"stage\", \"object_count\"}.issubset(objects_per_stage.columns):\n", " raise ValueError(\"Data must contain columns 'stage' and 'object_count'\")\n", " # draw chart\n", - " chart = (\n", + " return (\n", " alt.Chart(objects_per_stage)\n", " .mark_bar(fill=\"#d6e100\")\n", " .encode(\n", @@ -278,19 +276,18 @@ " )\n", " .configure_view(strokeWidth=0)\n", " )\n", - " return chart\n", "\n", "\n", "def plot_releases_by_month(release_dates):\n", " # check if input contains the right columns\n", - " if not set([\"date\", \"collection_id\", \"release_type\", \"release_count\"]).issubset(release_dates.columns):\n", + " if not {\"date\", \"collection_id\", \"release_type\", \"release_count\"}.issubset(release_dates.columns):\n", " raise ValueError(\"Data must contain columns 'date', 'collection_id', 'release_type', 'release_count'\")\n", " # check if number of rows is more than 5000\n", " if release_dates.shape[0] > 5000:\n", " alt.data_transformers.disable_max_rows()\n", "\n", " # draw chart\n", - " chart = (\n", + " return (\n", " alt.Chart(release_dates)\n", " .mark_line(strokeWidth=3)\n", " .encode(\n", @@ -329,15 +326,14 @@ " )\n", " .configure_view(strokeWidth=0)\n", " )\n", - " return chart\n", "\n", "\n", "def plot_objects_per_year(objects_per_year):\n", " # check if input contains the right columns\n", - " if not set([\"year\", \"tenders\", \"awards\"]).issubset(objects_per_year.columns):\n", + " if not {\"year\", \"tenders\", \"awards\"}.issubset(objects_per_year.columns):\n", " raise ValueError(\"Data must contain columns 'year', 'tenders' and 'awards'\")\n", " # draw chart\n", - " chart = (\n", + " return (\n", " alt.Chart(objects_per_year)\n", " .transform_fold([\"tenders\", \"awards\"])\n", " .mark_line(strokeWidth=3)\n", @@ -380,15 +376,14 @@ " )\n", " .configure_view(strokeWidth=0)\n", " )\n", - " return chart\n", "\n", "\n", "def plot_top_buyers(buyers):\n", " # check if input contains the right columns\n", - " if not set([\"name\", \"total_tenders\"]).issubset(buyers.columns):\n", + " if not {\"name\", \"total_tenders\"}.issubset(buyers.columns):\n", " raise ValueError(\"Data must contain columns 'name' and 'total_tenders'\")\n", " # draw chart\n", - " chart = (\n", + " return (\n", " alt.Chart(buyers)\n", " .mark_bar(fill=\"#d6e100\")\n", " .encode(\n", @@ -422,8 +417,7 @@ " domain=False,\n", " )\n", " .configure_view(strokeWidth=0)\n", - " )\n", - " return chart" + " )\n" ] }, { diff --git a/template_usability_checks_registry.ipynb b/template_usability_checks_registry.ipynb index 58b759a..993956c 100644 --- a/template_usability_checks_registry.ipynb +++ b/template_usability_checks_registry.ipynb @@ -179,11 +179,11 @@ "\n", "def plot_release_count(release_counts):\n", " # check if input contains the right columns\n", - " if not set([\"collection_id\", \"release_type\", \"release_count\", \"ocid_count\"]).issubset(release_counts.columns):\n", + " if not {\"collection_id\", \"release_type\", \"release_count\", \"ocid_count\"}.issubset(release_counts.columns):\n", " raise ValueError(\n", " \"Input data must contain the following columns: collection_id, release_type, release_count, ocid_count\"\n", " )\n", - " chart = (\n", + " return (\n", " alt.Chart(release_counts)\n", " .mark_bar()\n", " .encode(\n", @@ -226,15 +226,13 @@ " .configure_view(strokeWidth=0)\n", " )\n", "\n", - " return chart\n", - "\n", "\n", "def plot_objects_per_stage(objects_per_stage):\n", " # check if input contains the right columns\n", - " if not set([\"stage\", \"object_count\"]).issubset(objects_per_stage.columns):\n", + " if not {\"stage\", \"object_count\"}.issubset(objects_per_stage.columns):\n", " raise ValueError(\"Data must contain columns 'stage' and 'object_count'\")\n", " # draw chart\n", - " chart = (\n", + " return (\n", " alt.Chart(objects_per_stage)\n", " .mark_bar(fill=\"#d6e100\")\n", " .encode(\n", @@ -278,19 +276,18 @@ " )\n", " .configure_view(strokeWidth=0)\n", " )\n", - " return chart\n", "\n", "\n", "def plot_releases_by_month(release_dates):\n", " # check if input contains the right columns\n", - " if not set([\"date\", \"collection_id\", \"release_type\", \"release_count\"]).issubset(release_dates.columns):\n", + " if not {\"date\", \"collection_id\", \"release_type\", \"release_count\"}.issubset(release_dates.columns):\n", " raise ValueError(\"Data must contain columns 'date', 'collection_id', 'release_type', 'release_count'\")\n", " # check if number of rows is more than 5000\n", " if release_dates.shape[0] > 5000:\n", " alt.data_transformers.disable_max_rows()\n", "\n", " # draw chart\n", - " chart = (\n", + " return (\n", " alt.Chart(release_dates)\n", " .mark_line(strokeWidth=3)\n", " .encode(\n", @@ -329,15 +326,14 @@ " )\n", " .configure_view(strokeWidth=0)\n", " )\n", - " return chart\n", "\n", "\n", "def plot_objects_per_year(objects_per_year):\n", " # check if input contains the right columns\n", - " if not set([\"year\", \"tenders\", \"awards\"]).issubset(objects_per_year.columns):\n", + " if not {\"year\", \"tenders\", \"awards\"}.issubset(objects_per_year.columns):\n", " raise ValueError(\"Data must contain columns 'year', 'tenders' and 'awards'\")\n", " # draw chart\n", - " chart = (\n", + " return (\n", " alt.Chart(objects_per_year)\n", " .transform_fold([\"tenders\", \"awards\"])\n", " .mark_line(strokeWidth=3)\n", @@ -380,15 +376,14 @@ " )\n", " .configure_view(strokeWidth=0)\n", " )\n", - " return chart\n", "\n", "\n", "def plot_top_buyers(buyers):\n", " # check if input contains the right columns\n", - " if not set([\"name\", \"total_tenders\"]).issubset(buyers.columns):\n", + " if not {\"name\", \"total_tenders\"}.issubset(buyers.columns):\n", " raise ValueError(\"Data must contain columns 'name' and 'total_tenders'\")\n", " # draw chart\n", - " chart = (\n", + " return (\n", " alt.Chart(buyers)\n", " .mark_bar(fill=\"#d6e100\")\n", " .encode(\n", @@ -422,8 +417,7 @@ " domain=False,\n", " )\n", " .configure_view(strokeWidth=0)\n", - " )\n", - " return chart" + " )\n" ] }, {