diff --git a/airpy/metric_utils.py b/airpy/metric_utils.py index 94aa729..ea43641 100644 --- a/airpy/metric_utils.py +++ b/airpy/metric_utils.py @@ -4,7 +4,7 @@ import numpy as np import copy -from landcover_constants import MODIS_LC, FIRE_LC +from .landcover_constants import MODIS_LC, FIRE_LC class MetricUtils(): def __init__(self, img_arr): diff --git a/airpy/processor_modules.py b/airpy/processor_modules.py index 20326af..1310559 100644 --- a/airpy/processor_modules.py +++ b/airpy/processor_modules.py @@ -2,10 +2,10 @@ Module for processing GEE datasets """ -from metric_utils import MetricUtils +from .metric_utils import MetricUtils import numpy as np import ee -from landcover_constants import MODIS_LC, FIRE_LC +from .landcover_constants import MODIS_LC, FIRE_LC class ProcessorModules(): diff --git a/airpy/run_airpy.py b/airpy/run_airpy.py index e7b0a7d..8c64c5e 100644 --- a/airpy/run_airpy.py +++ b/airpy/run_airpy.py @@ -9,9 +9,9 @@ from retry import retry import logging import time -from utils import Utils -from processor_modules import ProcessorModules -from generate_config import GenerateConfig +from .utils import Utils +from .processor_modules import ProcessorModules +from .generate_config import GenerateConfig import datetime diff --git a/airpy/tests/__init__.py b/airpy/tests/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/airpy/tests/test_generate_config.py b/airpy/tests/test_generate_config.py index a30d9ac..b8d65d3 100644 --- a/airpy/tests/test_generate_config.py +++ b/airpy/tests/test_generate_config.py @@ -2,7 +2,7 @@ Test functions in generate_config """ import pytest -from generate_config import GenerateConfig +from airpy.generate_config import GenerateConfig class TestGenerateConfig(): diff --git a/airpy/tests/test_metric_utils.py b/airpy/tests/test_metric_utils.py index 333fb8c..ffb4e14 100644 --- a/airpy/tests/test_metric_utils.py +++ b/airpy/tests/test_metric_utils.py @@ -1,7 +1,7 @@ """ Test functions in metric utils """ -import metric_utils as mu +import airpy.metric_utils as mu import numpy as np test_array = np.array([[3,3,5], [160, 160, 3]]) diff --git a/airpy/tests/test_processor_modules.py b/airpy/tests/test_processor_modules.py index 67952bb..f050cee 100644 --- a/airpy/tests/test_processor_modules.py +++ b/airpy/tests/test_processor_modules.py @@ -1,8 +1,8 @@ """ Test functions in processor_modules """ -from processor_modules import ProcessorModules -from utils import Utils +from airpy.processor_modules import ProcessorModules +from airpy.utils import Utils import xarray as xr import ee diff --git a/airpy/tests/test_run_airpy.py b/airpy/tests/test_run_airpy.py index 043055b..b11d686 100644 --- a/airpy/tests/test_run_airpy.py +++ b/airpy/tests/test_run_airpy.py @@ -1,13 +1,14 @@ """ Test run_airpy pipeline """ -from run_airpy import * +from pathlib import Path +from airpy.run_airpy import * import xarray as xr import json config_file = 'test_config.json' -with open('../airpy/tests/{}'.format(config_file), 'r') as file: +with (Path(__file__).parent / config_file).open() as file: config_data = json.load(file) ee.Initialize() @@ -20,4 +21,4 @@ def test_getRequests(): def test_getResult(): """Test function to calculate GEE results""" items = getRequests(config_data) - assert type(getResult(0, items[0])) is xr.core.dataset.Dataset \ No newline at end of file + assert type(getResult(0, items[0])) is xr.core.dataset.Dataset diff --git a/airpy/tests/test_utils.py b/airpy/tests/test_utils.py index 7c969e0..a0c1ab4 100644 --- a/airpy/tests/test_utils.py +++ b/airpy/tests/test_utils.py @@ -2,7 +2,8 @@ Test functions in utils """ -from utils import Utils +from pathlib import Path +from airpy.utils import Utils import json import ee import numpy as np @@ -13,7 +14,7 @@ # Defining some constants config_file = 'test_config.json' -with open('../airpy/tests/{}'.format(config_file), 'r') as file: +with (Path(__file__).parent / config_file).open() as file: config_data = json.load(file) utils = Utils(config_data)