Move config to upper level

Jrc356 · Dec 20, 2019 · 366e40f · 366e40f
1 parent dbfd875
commit 366e40f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/data/scripts/config.json → config.json b/data/scripts/config.json → config.json
diff --git a/data/scripts/clean_data.py b/data/scripts/clean_data.py
@@ -7,7 +7,7 @@
 
 DATASETS_PATH = join(DATAFOLDER_PATH, "sets")
 
-with open(join(dirname(abspath(__file__)), 'config.json')) as f:
+with open(join(dirname(dirname(dirname(abspath(__file__)))), 'config.json')) as f:
     CONFIG = json.load(f)
 
 

diff --git a/data/scripts/collect_data.py b/data/scripts/collect_data.py
@@ -4,6 +4,7 @@
 from datetime import datetime
 import time
 import os
+from os.path import dirname
 import sys
 import logging
 from logging import handlers
@@ -23,7 +24,7 @@
 logger.addHandler(fh)
 # END LOGGING
 
-PATH = os.path.dirname(os.path.abspath(__file__))
+PATH = dirname(dirname(dirname(os.path.abspath(__file__))))
 
 with open(os.path.join(PATH, 'config.json')) as f:
     CONFIG = json.load(f)
@@ -49,7 +50,7 @@ def getPair(self, pair, start, stop, interval):
         return df
 
     def saveData(self, df, pair_name, start, end, interval):
-        pair_dir = os.path.join(os.path.dirname(PATH), "sets", pair_name)
+        pair_dir = os.path.join(dirname(PATH), "sets", pair_name)
         if not os.path.exists(pair_dir):
             os.mkdir(pair_dir)
 
@@ -63,7 +64,7 @@ def saveData(self, df, pair_name, start, end, interval):
             raise e
 
     def combine(self, pair_name):
-        pair_dir = os.path.join(os.path.dirname(PATH), "sets", pair_name)
+        pair_dir = os.path.join(dirname(PATH), "sets", pair_name)
         files = os.listdir(pair_dir)
         files = [file for file in files if "COMPLETE" not in file and "parts" not in file]