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/.

1 files changed, 6 insertions, 10 deletions

diff --git a/backend/hist_data/gen_events_data.py b/backend/hist_data/gen_events_data.py
index 453a9ad..d433ce7 100755
--- a/backend/hist_data/gen_events_data.py
+++ b/backend/hist_data/gen_events_data.py
@@ -61,14 +61,9 @@ Info about objects with type 'quantity' can be found at: https://www.wikidata.or
 
 # Note: Took about 4.5 hours to run
 
-# 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)
-
 from typing import cast
 import argparse
+import os
 import math
 import re
 import io
@@ -81,13 +76,14 @@ import pickle
 import multiprocessing
 import tempfile
 
-from cal import gregorianToJdn, julianToJdn, MIN_CAL_YEAR
+from .cal import gregorianToJdn, julianToJdn, MIN_CAL_YEAR
 
 # ========== Constants ==========
 
-WIKIDATA_FILE = os.path.join('wikidata', 'latest-all.json.bz2')
-OFFSETS_FILE = os.path.join('wikidata', 'offsets.dat')
-DB_FILE = 'data.db'
+DATA_DIR = os.path.dirname(os.path.realpath(__file__))
+WIKIDATA_FILE = os.path.join(DATA_DIR, 'wikidata', 'latest-all.json.bz2')
+OFFSETS_FILE = os.path.join(DATA_DIR, 'wikidata', 'offsets.dat')
+DB_FILE = os.path.join(DATA_DIR, 'data.db')
 N_PROCS = 6 # Number of processes to use
 
 # For getting Wikidata entity IDs