From cdc6d9cc89725f01c6da938de8769efc1da79574 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Wed, 31 Aug 2022 15:05:37 +0300
Subject: [PATCH] Packagify pulkka

---
 Makefile                                              | 8 ++++----
 pulkka/__init__.py                                    | 0
 chart_utils.py => pulkka/chart_utils.py               | 2 +-
 copy_massaged_data.py => pulkka/copy_massaged_data.py | 2 +-
 data_ingest.py => pulkka/data_ingest.py               | 0
 data_utils.py => pulkka/data_utils.py                 | 0
 generate_charts.py => pulkka/generate_charts.py       | 4 ++--
 generate_profiling.py => pulkka/generate_profiling.py | 2 +-
 massage_templates.py => pulkka/massage_templates.py   | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)
 create mode 100644 pulkka/__init__.py
 rename chart_utils.py => pulkka/chart_utils.py (97%)
 rename copy_massaged_data.py => pulkka/copy_massaged_data.py (89%)
 rename data_ingest.py => pulkka/data_ingest.py (100%)
 rename data_utils.py => pulkka/data_utils.py (100%)
 rename generate_charts.py => pulkka/generate_charts.py (95%)
 rename generate_profiling.py => pulkka/generate_profiling.py (76%)
 rename massage_templates.py => pulkka/massage_templates.py (94%)

diff --git a/Makefile b/Makefile
index cc970ba..b70d5eb 100644
--- a/Makefile
+++ b/Makefile
@@ -7,16 +7,16 @@ copy-raw-data: all-data
 	cp data/results.tsv out/raw.tsv
 
 copy-massaged-data: all-data
-	python copy_massaged_data.py
+	python -m pulkka.copy_massaged_data
 
 static: all-data
-	python massage_templates.py
+	python -m pulkka.massage_templates
 
 charts: all-data
-	python generate_charts.py
+	python -m pulkka.generate_charts
 
 profiling: all-data
-	python generate_profiling.py
+	python -m pulkka.generate_profiling
 
 all-data: data/results.xlsx data/results.tsv
 
diff --git a/pulkka/__init__.py b/pulkka/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/chart_utils.py b/pulkka/chart_utils.py
similarity index 97%
rename from chart_utils.py
rename to pulkka/chart_utils.py
index 98bd63d..6eb238f 100644
--- a/chart_utils.py
+++ b/pulkka/chart_utils.py
@@ -2,7 +2,7 @@ from bokeh import models as bm, plotting as bp
 from bokeh.transform import factor_cmap
 from pandas import DataFrame
 
-from data_utils import get_categorical_stats
+from pulkka.data_utils import get_categorical_stats
 
 CAT_Q_RADIUS = 0.1
 
diff --git a/copy_massaged_data.py b/pulkka/copy_massaged_data.py
similarity index 89%
rename from copy_massaged_data.py
rename to pulkka/copy_massaged_data.py
index b38316c..0b765b9 100644
--- a/copy_massaged_data.py
+++ b/pulkka/copy_massaged_data.py
@@ -1,4 +1,4 @@
-from data_ingest import read_data
+from pulkka.data_ingest import read_data
 
 
 def main():
diff --git a/data_ingest.py b/pulkka/data_ingest.py
similarity index 100%
rename from data_ingest.py
rename to pulkka/data_ingest.py
diff --git a/data_utils.py b/pulkka/data_utils.py
similarity index 100%
rename from data_utils.py
rename to pulkka/data_utils.py
diff --git a/generate_charts.py b/pulkka/generate_charts.py
similarity index 95%
rename from generate_charts.py
rename to pulkka/generate_charts.py
index 6df9729..7de3c22 100644
--- a/generate_charts.py
+++ b/pulkka/generate_charts.py
@@ -3,13 +3,13 @@ import bokeh.models as bm
 import bokeh.layouts as bl
 from pandas import DataFrame
 
-from chart_utils import (
+from pulkka.chart_utils import (
     gender_colormap,
     get_df_hover_tool,
     set_yaxis_cash,
     get_categorical_stats_plot,
 )
-from data_ingest import read_data
+from pulkka.data_ingest import read_data
 
 plot_funcs = set()
 
diff --git a/generate_profiling.py b/pulkka/generate_profiling.py
similarity index 76%
rename from generate_profiling.py
rename to pulkka/generate_profiling.py
index 792150e..24789d4 100644
--- a/generate_profiling.py
+++ b/pulkka/generate_profiling.py
@@ -1,4 +1,4 @@
-from data_ingest import read_data, force_tulot_numeric, force_age_numeric
+from pulkka.data_ingest import read_data, force_tulot_numeric, force_age_numeric
 from pandas_profiling import ProfileReport
 
 
diff --git a/massage_templates.py b/pulkka/massage_templates.py
similarity index 94%
rename from massage_templates.py
rename to pulkka/massage_templates.py
index 5aa2a6f..eb43ef1 100644
--- a/massage_templates.py
+++ b/pulkka/massage_templates.py
@@ -6,7 +6,7 @@ import jinja2
 import numpy
 import pandas
 
-from data_ingest import read_data
+from pulkka.data_ingest import read_data
 
 
 def main():