aboutsummaryrefslogtreecommitdiff
path: root/backend/hist_data/gen_disp_data.py
diff options
context:
space:
mode:
authorTerry Truong <terry06890@gmail.com>2023-02-05 13:55:00 +1100
committerTerry Truong <terry06890@gmail.com>2023-02-05 13:55:00 +1100
commitff638e269d439c853b5182b68ff10777f12597f1 (patch)
tree2cc62068a501884821969b6ebeba3686df8f4044 /backend/hist_data/gen_disp_data.py
parentcc79c17fbc05bddc8b08f2734e721bc241123a4e (diff)
Use relative imports between data generation scriptspackage-imports
Avoids the need for code that modifies sys.path, but requires running of the scripts using 'python -m' with backend/ as cwd. Also expects constants like DB_FILE to be non-relative, due to running from backend/.
Diffstat (limited to 'backend/hist_data/gen_disp_data.py')
-rwxr-xr-xbackend/hist_data/gen_disp_data.py13
1 files changed, 5 insertions, 8 deletions
diff --git a/backend/hist_data/gen_disp_data.py b/backend/hist_data/gen_disp_data.py
index 6bb84ad..ca9b172 100755
--- a/backend/hist_data/gen_disp_data.py
+++ b/backend/hist_data/gen_disp_data.py
@@ -5,19 +5,16 @@ Adds data about event distribution to the database,
and removes events not eligible for display
"""
-# For unit testing, resolve imports of modules within this directory
-import os
-import sys
-parentDir = os.path.dirname(os.path.realpath(__file__))
-sys.path.append(parentDir)
-
import argparse
+import os
import sqlite3
-from cal import SCALES, dbDateToHistDate, dateToUnit
+from .cal import SCALES, dbDateToHistDate, dateToUnit
MAX_DISPLAYED_PER_UNIT = 4
-DB_FILE = 'data.db'
+
+DATA_DIR = os.path.dirname(os.path.realpath(__file__))
+DB_FILE = os.path.join(DATA_DIR, 'data.db')
def genData(dbFile: str, scales: list[int], maxDisplayedPerUnit: int, forImageTables: bool) -> None:
dbCon = sqlite3.connect(dbFile)