From 43f0001b6907436b359f344f869f95ea7ef069c6 Mon Sep 17 00:00:00 2001
From: Clemens Berteld <clemens@berteld.com>
Date: Sun, 19 Sep 2021 12:06:57 +0200
Subject: [PATCH] Moved config file to main directory
---
api/GetAverageData.py | 2 +-
api/api.py | 2 +-
dataacquisition/ExportToDatabase.py | 2 +-
dataacquisition/config.ini | 12 ------------
dataacquisition/test_ExportToDatabase.py | 2 +-
5 files changed, 4 insertions(+), 16 deletions(-)
delete mode 100644 dataacquisition/config.ini
diff --git a/api/GetAverageData.py b/api/GetAverageData.py
index bebb4fc..b465465 100644
--- a/api/GetAverageData.py
+++ b/api/GetAverageData.py
@@ -4,7 +4,7 @@ import psycopg2
from psycopg2 import sql
cfg = configparser.ConfigParser()
-cfg.read('config.ini')
+cfg.read('../config.ini')
assert "POSTGRES" in cfg, "missing POSTGRES in config.ini"
assert "INTERPOLATION" in cfg, "missing INTERPOLATION in config.ini"
param_postgres = cfg["POSTGRES"]
diff --git a/api/api.py b/api/api.py
index 350becc..0f0fa09 100644
--- a/api/api.py
+++ b/api/api.py
@@ -5,7 +5,7 @@ import configparser
from GetAverageData import get_interpolation_data_for_point
cfg = configparser.ConfigParser()
-cfg.read('config.ini')
+cfg.read('../config.ini')
assert "POSTGRES" in cfg, "missing POSTGRES in config.ini"
param_postgres = cfg["POSTGRES"]
diff --git a/dataacquisition/ExportToDatabase.py b/dataacquisition/ExportToDatabase.py
index 3b1be20..b1746e2 100644
--- a/dataacquisition/ExportToDatabase.py
+++ b/dataacquisition/ExportToDatabase.py
@@ -16,7 +16,7 @@ import configparser
from api.GetAverageData import get_interpolation_data_for_point
cfg = configparser.ConfigParser()
-cfg.read('config.ini')
+cfg.read('../config.ini')
assert "POSTGRES" in cfg, "missing POSTGRES in config.ini"
param_postgres = cfg["POSTGRES"]
param_interpol = cfg["INTERPOLATION"]
diff --git a/dataacquisition/config.ini b/dataacquisition/config.ini
deleted file mode 100644
index 6f7d770..0000000
--- a/dataacquisition/config.ini
+++ /dev/null
@@ -1,12 +0,0 @@
-[POSTGRES]
-host = localhost
-port = 5432
-user = postgres
-password = postgres
-dbName = temperatures_berteld_morstein
-
-[INTERPOLATION]
-; neighbouring measurements used for interpolation
-amount_neighbours = 5
-; in km. 25km or 10km possible
-matrix_density = 25
\ No newline at end of file
diff --git a/dataacquisition/test_ExportToDatabase.py b/dataacquisition/test_ExportToDatabase.py
index 5b9b02f..2c04bd3 100644
--- a/dataacquisition/test_ExportToDatabase.py
+++ b/dataacquisition/test_ExportToDatabase.py
@@ -14,7 +14,7 @@ import psycopg2
import time
cfg = configparser.ConfigParser()
-cfg.read('config.ini')
+cfg.read('../config.ini')
assert "POSTGRES" in cfg, "missing POSTGRES in config.ini"
--
GitLab