From de20fd92832b6a5ff76dff0e9343a53b2cc1a49c Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Mon, 28 Oct 2024 11:40:25 +0200
Subject: [PATCH] Sort imports

---
 pulkka/chart_utils.py        |  3 ++-
 pulkka/data_ingest.py        | 46 ++++++++++++++++++------------------
 pulkka/generate_charts.py    | 12 +++++-----
 pulkka/generate_profiling.py |  4 ++--
 ruff.toml                    |  2 ++
 5 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/pulkka/chart_utils.py b/pulkka/chart_utils.py
index 2056d17..e42c3ed 100644
--- a/pulkka/chart_utils.py
+++ b/pulkka/chart_utils.py
@@ -1,4 +1,5 @@
-from bokeh import models as bm, plotting as bp
+from bokeh import models as bm
+from bokeh import plotting as bp
 from bokeh.transform import factor_cmap
 from pandas import DataFrame
 
diff --git a/pulkka/data_ingest.py b/pulkka/data_ingest.py
index 0429471..cc9cd39 100644
--- a/pulkka/data_ingest.py
+++ b/pulkka/data_ingest.py
@@ -8,35 +8,35 @@ import numpy as np
 import pandas
 import pandas as pd
 
-from pulkka.config import DATA_DIR, YEAR
 from pulkka.column_maps import (
-    COLUMN_MAP_2023_EN_TO_FI,
-    KIKY_COL,
-    KKPALKKA_COL,
-    PALVELUT_COL,
-    TYOAIKA_COL,
-    VUOSITULOT_COL,
-    TYOPAIKKA_COL,
-    ROOLI_COL,
-    KIKY_OTHER_COL,
     BOOLEAN_TEXT_TO_BOOLEAN_MAP,
-    COMPANY_MAP,
-    SUKUPUOLI_COL,
-    ROLE_MAP,
     COLUMN_MAP_2023,
-    VALUE_MAP_2023_EN_TO_FI,
-    LAHITYO_COL,
-    IKA_COL,
-    LANG_COL,
-    KK_TULOT_COL,
-    KK_TULOT_NORM_COL,
-    NO_GENDER_VALUES,
-    OTHER_GENDER_VALUES,
-    TYOKOKEMUS_COL,
-    ROOLI_NORM_COL,
+    COLUMN_MAP_2023_EN_TO_FI,
+    COMPANY_MAP,
     ID_COL,
     IDS_TO_DROP,
+    IKA_COL,
+    KIKY_COL,
+    KIKY_OTHER_COL,
+    KK_TULOT_COL,
+    KK_TULOT_NORM_COL,
+    KKPALKKA_COL,
+    LAHITYO_COL,
+    LANG_COL,
+    NO_GENDER_VALUES,
+    OTHER_GENDER_VALUES,
+    PALVELUT_COL,
+    ROLE_MAP,
+    ROOLI_COL,
+    ROOLI_NORM_COL,
+    SUKUPUOLI_COL,
+    TYOAIKA_COL,
+    TYOKOKEMUS_COL,
+    TYOPAIKKA_COL,
+    VALUE_MAP_2023_EN_TO_FI,
+    VUOSITULOT_COL,
 )
+from pulkka.config import DATA_DIR, YEAR
 
 
 def map_sukupuoli(r: pd.Series) -> str | None:
diff --git a/pulkka/generate_charts.py b/pulkka/generate_charts.py
index 6e950a2..3cf7f22 100644
--- a/pulkka/generate_charts.py
+++ b/pulkka/generate_charts.py
@@ -1,20 +1,20 @@
-import bokeh.plotting as bp
-import bokeh.models as bm
 import bokeh.layouts as bl
+import bokeh.models as bm
+import bokeh.plotting as bp
 from pandas import DataFrame
 
 from pulkka.chart_utils import (
     gender_colormap,
+    get_categorical_stats_plot,
     get_df_hover_tool,
     set_yaxis_cash,
-    get_categorical_stats_plot,
 )
 from pulkka.column_maps import (
+    IKA_COL,
+    KAUPUNKI_COL,
+    SUKUPUOLI_COL,
     TYOKOKEMUS_COL,
     VUOSITULOT_COL,
-    KAUPUNKI_COL,
-    IKA_COL,
-    SUKUPUOLI_COL,
 )
 from pulkka.config import OUT_DIR
 from pulkka.data_ingest import read_data
diff --git a/pulkka/generate_profiling.py b/pulkka/generate_profiling.py
index b4e5ddc..f1c28ce 100644
--- a/pulkka/generate_profiling.py
+++ b/pulkka/generate_profiling.py
@@ -1,9 +1,9 @@
 import pandas as pd
+from ydata_profiling import ProfileReport
 
 from pulkka.column_maps import KKPALKKA_COL, VUOSITULOT_COL
 from pulkka.config import OUT_DIR
-from pulkka.data_ingest import read_data, force_age_numeric
-from ydata_profiling import ProfileReport
+from pulkka.data_ingest import force_age_numeric, read_data
 
 
 def main():
diff --git a/ruff.toml b/ruff.toml
index ccbc2ae..d25d5ed 100644
--- a/ruff.toml
+++ b/ruff.toml
@@ -1,8 +1,10 @@
+[lint]
 ignore = [
     "E501",
     "PD901",  # I know "df" isn't the best name
 ]
 extend-select = [
     "COM",
+    "I",
     "PD",
 ]