From 15a7b81ea7b7e957a998d37e6e0e1c7b2c1a857b Mon Sep 17 00:00:00 2001 From: lb584 <lb584@cam.ac.uk> Date: Thu, 16 May 2024 15:08:03 +0100 Subject: [PATCH] repackaging coordinator --- .gitignore | 2 +- {coordinator => ews/coordinator}/__init__.py | 0 .../coordinator}/processor_advisory.py | 4 ++-- .../coordinator}/processor_base.py | 4 ++-- .../coordinator}/processor_deposition.py | 6 +++--- .../coordinator}/processor_environment.py | 4 ++-- .../coordinator}/processor_epidemiology.py | 4 ++-- .../coordinator}/processor_scraper.py | 0 .../coordinator}/processor_surveys.py | 18 +++++++++--------- .../coordinator}/survey_servers/__init__.py | 0 .../survey_servers/processor_survey_utils.py | 0 .../processor_surveys_kobotoolbox.py | 4 ++-- .../processor_surveys_new_odk.py | 4 ++-- .../processor_surveys_new_odk2.py | 6 +++--- .../survey_servers/processor_surveys_odk.py | 2 +- .../survey_servers/processor_surveys_odk_sa.py | 4 ++-- .../survey_servers/processor_surveys_odk_v2.py | 4 ++-- .../survey_servers/processor_surveys_wrsis.py | 4 ++-- .../survey_servers/processor_surveys_wrt.py | 4 ++-- .../coordinator}/utils/__init__.py | 0 .../utils/buffering_smtp_handler.py | 0 .../coordinator}/utils/processor_utils.py | 8 +++----- tests/integration/full/full_test_advisory.py | 8 ++++---- tests/integration/full/full_test_deposition.py | 2 +- tests/integration/full/full_test_env_suit.py | 2 +- tests/integration/full/full_test_epi.py | 6 +++--- tests/integration/full/full_test_survey.py | 2 +- .../partial/integration_test_utils.py | 4 ++-- tests/integration/partial/test_advisory.py | 2 +- tests/integration/partial/test_deposition.py | 2 +- tests/integration/partial/test_env_suit.py | 2 +- tests/integration/partial/test_epi.py | 2 +- tests/integration/partial/test_survey.py | 2 +- 33 files changed, 57 insertions(+), 59 deletions(-) rename {coordinator => ews/coordinator}/__init__.py (100%) rename {coordinator => ews/coordinator}/processor_advisory.py (94%) rename {coordinator => ews/coordinator}/processor_base.py (98%) rename {coordinator => ews/coordinator}/processor_deposition.py (97%) rename {coordinator => ews/coordinator}/processor_environment.py (99%) rename {coordinator => ews/coordinator}/processor_epidemiology.py (99%) rename {coordinator => ews/coordinator}/processor_scraper.py (100%) rename {coordinator => ews/coordinator}/processor_surveys.py (95%) rename {coordinator => ews/coordinator}/survey_servers/__init__.py (100%) rename {coordinator => ews/coordinator}/survey_servers/processor_survey_utils.py (100%) rename {coordinator => ews/coordinator}/survey_servers/processor_surveys_kobotoolbox.py (98%) rename {coordinator => ews/coordinator}/survey_servers/processor_surveys_new_odk.py (98%) rename {coordinator => ews/coordinator}/survey_servers/processor_surveys_new_odk2.py (98%) rename {coordinator => ews/coordinator}/survey_servers/processor_surveys_odk.py (99%) rename {coordinator => ews/coordinator}/survey_servers/processor_surveys_odk_sa.py (98%) rename {coordinator => ews/coordinator}/survey_servers/processor_surveys_odk_v2.py (99%) rename {coordinator => ews/coordinator}/survey_servers/processor_surveys_wrsis.py (99%) rename {coordinator => ews/coordinator}/survey_servers/processor_surveys_wrt.py (98%) rename {coordinator => ews/coordinator}/utils/__init__.py (100%) rename {coordinator => ews/coordinator}/utils/buffering_smtp_handler.py (100%) rename {coordinator => ews/coordinator}/utils/processor_utils.py (99%) diff --git a/.gitignore b/.gitignore index 7a39135..77b5d43 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ scratch* *.pyc *.zip -coordinator/logs/* +ews/coordinator/logs/* logs/* *.log Cred-WRSIS-API.json diff --git a/coordinator/__init__.py b/ews/coordinator/__init__.py similarity index 100% rename from coordinator/__init__.py rename to ews/coordinator/__init__.py diff --git a/coordinator/processor_advisory.py b/ews/coordinator/processor_advisory.py similarity index 94% rename from coordinator/processor_advisory.py rename to ews/coordinator/processor_advisory.py index b0e7f8b..78aaa13 100644 --- a/coordinator/processor_advisory.py +++ b/ews/coordinator/processor_advisory.py @@ -5,8 +5,8 @@ import logging # gitlab projects # TODO: Package these projects so they are robust for importing -from coordinator.utils.processor_utils import short_name -from coordinator.processor_base import ProcessorBase +from ews.coordinator.utils.processor_utils import short_name +from ews.coordinator.processor_base import ProcessorBase from ews.advisory_builder import data_gatherer diff --git a/coordinator/processor_base.py b/ews/coordinator/processor_base.py similarity index 98% rename from coordinator/processor_base.py rename to ews/coordinator/processor_base.py index f099b95..4a93861 100755 --- a/coordinator/processor_base.py +++ b/ews/coordinator/processor_base.py @@ -19,8 +19,8 @@ or:: from abc import abstractmethod, ABCMeta from typing import List -from coordinator.utils import processor_utils -from coordinator.utils.processor_utils import short_name, open_and_check_config, end_script, end_job, append_item_to_list, \ +from ews.coordinator.utils import processor_utils +from ews.coordinator.utils.processor_utils import short_name, open_and_check_config, end_script, end_job, append_item_to_list, \ clear_up diff --git a/coordinator/processor_deposition.py b/ews/coordinator/processor_deposition.py similarity index 97% rename from coordinator/processor_deposition.py rename to ews/coordinator/processor_deposition.py index 06b3829..4860233 100644 --- a/coordinator/processor_deposition.py +++ b/ews/coordinator/processor_deposition.py @@ -10,9 +10,9 @@ from string import Template import iris from iris.cube import CubeList -from coordinator.utils import processor_utils -from coordinator.utils.processor_utils import subprocess_and_log, get_only_existing_globs -from coordinator.processor_base import ProcessorBase +from ews.coordinator.utils import processor_utils +from ews.coordinator.utils.processor_utils import subprocess_and_log, get_only_existing_globs +from ews.coordinator.processor_base import ProcessorBase from ews.postprocessing.deposition.deposition_post_processor import DepositionPostProcessor logger = logging.getLogger(__name__) diff --git a/coordinator/processor_environment.py b/ews/coordinator/processor_environment.py similarity index 99% rename from coordinator/processor_environment.py rename to ews/coordinator/processor_environment.py index ffcb8df..1708eeb 100644 --- a/coordinator/processor_environment.py +++ b/ews/coordinator/processor_environment.py @@ -12,8 +12,8 @@ from pathlib import Path import pandas as pd # from coordinator.env_suit import env_suit_pipeline -from coordinator.processor_base import ProcessorBase -from coordinator.utils.processor_utils import get_only_existing_globs, get_input_data +from ews.coordinator.processor_base import ProcessorBase +from ews.coordinator.utils.processor_utils import get_only_existing_globs, get_input_data from ews.postprocessing.environmental_suitability.env_suit_post_processor import EnvSuitPostProcessor from ews.postprocessing.utils.disease_info import EnvSuitDiseaseInfo from ews.met_processing.common.params_file_parser import ParamsFileParser diff --git a/coordinator/processor_epidemiology.py b/ews/coordinator/processor_epidemiology.py similarity index 99% rename from coordinator/processor_epidemiology.py rename to ews/coordinator/processor_epidemiology.py index f638f59..5418a4c 100644 --- a/coordinator/processor_epidemiology.py +++ b/ews/coordinator/processor_epidemiology.py @@ -22,10 +22,10 @@ from EpiModel import ( # created by rs481 plotRaster ) from EpiModel.EpiPrep import prep -from coordinator.processor_base import ProcessorBase +from ews.coordinator.processor_base import ProcessorBase from ews.postprocessing.epi.epi_post_processor import EPIPostPostProcessor -from coordinator.utils.processor_utils import ( +from ews.coordinator.utils.processor_utils import ( calc_epi_date_range, open_and_check_config, get_only_existing_globs, diff --git a/coordinator/processor_scraper.py b/ews/coordinator/processor_scraper.py similarity index 100% rename from coordinator/processor_scraper.py rename to ews/coordinator/processor_scraper.py diff --git a/coordinator/processor_surveys.py b/ews/coordinator/processor_surveys.py similarity index 95% rename from coordinator/processor_surveys.py rename to ews/coordinator/processor_surveys.py index 0d0edd6..ffc2355 100644 --- a/coordinator/processor_surveys.py +++ b/ews/coordinator/processor_surveys.py @@ -34,15 +34,15 @@ from numpy import all as np_all from numpy import any as np_any from pandas import read_csv, concat -from coordinator.survey_servers.processor_surveys_odk import get_ODK_form_as_csv -from coordinator.survey_servers.processor_surveys_odk_sa import get_ODK_SA_form_as_csv -from coordinator.survey_servers.processor_surveys_odk_v2 import get_ODKv2_form_as_csv -from coordinator.survey_servers.processor_surveys_wrsis import get_WRSIS_form_as_csv -from coordinator.survey_servers.processor_surveys_wrt import get_WRT_form_as_csv -from coordinator.survey_servers.processor_surveys_kobotoolbox import get_kobotoolbox_form_as_csv -from coordinator.survey_servers.processor_surveys_new_odk import get_newODK_form_as_csv -from coordinator.survey_servers.processor_surveys_new_odk2 import get_newODK2_form_as_csv -from coordinator.processor_base import ProcessorBase +from ews.coordinator.survey_servers.processor_surveys_odk import get_ODK_form_as_csv +from ews.coordinator.survey_servers.processor_surveys_odk_sa import get_ODK_SA_form_as_csv +from ews.coordinator.survey_servers.processor_surveys_odk_v2 import get_ODKv2_form_as_csv +from ews.coordinator.survey_servers.processor_surveys_wrsis import get_WRSIS_form_as_csv +from ews.coordinator.survey_servers.processor_surveys_wrt import get_WRT_form_as_csv +from ews.coordinator.survey_servers.processor_surveys_kobotoolbox import get_kobotoolbox_form_as_csv +from ews.coordinator.survey_servers.processor_surveys_new_odk import get_newODK_form_as_csv +from ews.coordinator.survey_servers.processor_surveys_new_odk2 import get_newODK2_form_as_csv +from ews.coordinator.processor_base import ProcessorBase from ews.source_gen.clustering import run_case diff --git a/coordinator/survey_servers/__init__.py b/ews/coordinator/survey_servers/__init__.py similarity index 100% rename from coordinator/survey_servers/__init__.py rename to ews/coordinator/survey_servers/__init__.py diff --git a/coordinator/survey_servers/processor_survey_utils.py b/ews/coordinator/survey_servers/processor_survey_utils.py similarity index 100% rename from coordinator/survey_servers/processor_survey_utils.py rename to ews/coordinator/survey_servers/processor_survey_utils.py diff --git a/coordinator/survey_servers/processor_surveys_kobotoolbox.py b/ews/coordinator/survey_servers/processor_surveys_kobotoolbox.py similarity index 98% rename from coordinator/survey_servers/processor_surveys_kobotoolbox.py rename to ews/coordinator/survey_servers/processor_surveys_kobotoolbox.py index ae27616..b9f96c5 100644 --- a/coordinator/survey_servers/processor_surveys_kobotoolbox.py +++ b/ews/coordinator/survey_servers/processor_surveys_kobotoolbox.py @@ -11,8 +11,8 @@ import requests from shutil import copyfile from pandas import DataFrame -from coordinator.survey_servers.processor_survey_utils import parse_columns -from coordinator.utils.processor_utils import end_job +from ews.coordinator.survey_servers.processor_survey_utils import parse_columns +from ews.coordinator.utils.processor_utils import end_job logger = logging.getLogger(__name__) diff --git a/coordinator/survey_servers/processor_surveys_new_odk.py b/ews/coordinator/survey_servers/processor_surveys_new_odk.py similarity index 98% rename from coordinator/survey_servers/processor_surveys_new_odk.py rename to ews/coordinator/survey_servers/processor_surveys_new_odk.py index 9436dd6..5746843 100644 --- a/coordinator/survey_servers/processor_surveys_new_odk.py +++ b/ews/coordinator/survey_servers/processor_surveys_new_odk.py @@ -11,8 +11,8 @@ import requests from shutil import copyfile from pandas import DataFrame -from coordinator.survey_servers.processor_survey_utils import parse_columns -from coordinator.utils.processor_utils import end_job +from ews.coordinator.survey_servers.processor_survey_utils import parse_columns +from ews.coordinator.utils.processor_utils import end_job logger = logging.getLogger(__name__) diff --git a/coordinator/survey_servers/processor_surveys_new_odk2.py b/ews/coordinator/survey_servers/processor_surveys_new_odk2.py similarity index 98% rename from coordinator/survey_servers/processor_surveys_new_odk2.py rename to ews/coordinator/survey_servers/processor_surveys_new_odk2.py index 5e4bdee..c5b6ea4 100644 --- a/coordinator/survey_servers/processor_surveys_new_odk2.py +++ b/ews/coordinator/survey_servers/processor_surveys_new_odk2.py @@ -10,14 +10,14 @@ from shutil import copyfile import requests -from coordinator.survey_servers.processor_survey_utils import parse_columns -from coordinator.survey_servers.processor_surveys_new_odk import ( +from ews.coordinator.survey_servers.processor_survey_utils import parse_columns +from ews.coordinator.survey_servers.processor_surveys_new_odk import ( cases_incident, cases_severity, get_from_kobotoolbox, build_dataframe ) -from coordinator.utils.processor_utils import end_job +from ews.coordinator.utils.processor_utils import end_job logger = logging.getLogger(__name__) diff --git a/coordinator/survey_servers/processor_surveys_odk.py b/ews/coordinator/survey_servers/processor_surveys_odk.py similarity index 99% rename from coordinator/survey_servers/processor_surveys_odk.py rename to ews/coordinator/survey_servers/processor_surveys_odk.py index 34780f6..fcfe93e 100644 --- a/coordinator/survey_servers/processor_surveys_odk.py +++ b/ews/coordinator/survey_servers/processor_surveys_odk.py @@ -9,7 +9,7 @@ from pathlib import Path from shutil import copyfile from string import Template -from coordinator.utils.processor_utils import ( +from ews.coordinator.utils.processor_utils import ( subprocess_and_log, end_job, ) diff --git a/coordinator/survey_servers/processor_surveys_odk_sa.py b/ews/coordinator/survey_servers/processor_surveys_odk_sa.py similarity index 98% rename from coordinator/survey_servers/processor_surveys_odk_sa.py rename to ews/coordinator/survey_servers/processor_surveys_odk_sa.py index a1ddc1c..1e035af 100644 --- a/coordinator/survey_servers/processor_surveys_odk_sa.py +++ b/ews/coordinator/survey_servers/processor_surveys_odk_sa.py @@ -13,8 +13,8 @@ from string import Template from pandas import read_csv -from coordinator.survey_servers.processor_survey_utils import parse_columns -from coordinator.utils.processor_utils import subprocess_and_log, end_job +from ews.coordinator.survey_servers.processor_survey_utils import parse_columns +from ews.coordinator.utils.processor_utils import subprocess_and_log, end_job logger = logging.getLogger(__name__) diff --git a/coordinator/survey_servers/processor_surveys_odk_v2.py b/ews/coordinator/survey_servers/processor_surveys_odk_v2.py similarity index 99% rename from coordinator/survey_servers/processor_surveys_odk_v2.py rename to ews/coordinator/survey_servers/processor_surveys_odk_v2.py index 3c381a6..8c7fd3b 100644 --- a/coordinator/survey_servers/processor_surveys_odk_v2.py +++ b/ews/coordinator/survey_servers/processor_surveys_odk_v2.py @@ -14,8 +14,8 @@ from pathlib import Path from pandas import read_csv from shutil import copyfile -from coordinator.survey_servers.processor_survey_utils import parse_columns -from coordinator.utils.processor_utils import end_job +from ews.coordinator.survey_servers.processor_survey_utils import parse_columns +from ews.coordinator.utils.processor_utils import end_job logger = logging.getLogger(__name__) diff --git a/coordinator/survey_servers/processor_surveys_wrsis.py b/ews/coordinator/survey_servers/processor_surveys_wrsis.py similarity index 99% rename from coordinator/survey_servers/processor_surveys_wrsis.py rename to ews/coordinator/survey_servers/processor_surveys_wrsis.py index 9ac2cb8..9411ac2 100644 --- a/coordinator/survey_servers/processor_surveys_wrsis.py +++ b/ews/coordinator/survey_servers/processor_surveys_wrsis.py @@ -11,8 +11,8 @@ import requests from shutil import copyfile from pandas import json_normalize -from coordinator.survey_servers.processor_survey_utils import parse_columns -from coordinator.utils.processor_utils import end_job +from ews.coordinator.survey_servers.processor_survey_utils import parse_columns +from ews.coordinator.utils.processor_utils import end_job logger = logging.getLogger(__name__) diff --git a/coordinator/survey_servers/processor_surveys_wrt.py b/ews/coordinator/survey_servers/processor_surveys_wrt.py similarity index 98% rename from coordinator/survey_servers/processor_surveys_wrt.py rename to ews/coordinator/survey_servers/processor_surveys_wrt.py index 81c923e..cbf553b 100644 --- a/coordinator/survey_servers/processor_surveys_wrt.py +++ b/ews/coordinator/survey_servers/processor_surveys_wrt.py @@ -11,8 +11,8 @@ import requests from shutil import copyfile from pandas import json_normalize -from coordinator.survey_servers.processor_survey_utils import parse_columns -from coordinator.utils.processor_utils import end_job +from ews.coordinator.survey_servers.processor_survey_utils import parse_columns +from ews.coordinator.utils.processor_utils import end_job logger = logging.getLogger(__name__) diff --git a/coordinator/utils/__init__.py b/ews/coordinator/utils/__init__.py similarity index 100% rename from coordinator/utils/__init__.py rename to ews/coordinator/utils/__init__.py diff --git a/coordinator/utils/buffering_smtp_handler.py b/ews/coordinator/utils/buffering_smtp_handler.py similarity index 100% rename from coordinator/utils/buffering_smtp_handler.py rename to ews/coordinator/utils/buffering_smtp_handler.py diff --git a/coordinator/utils/processor_utils.py b/ews/coordinator/utils/processor_utils.py similarity index 99% rename from coordinator/utils/processor_utils.py rename to ews/coordinator/utils/processor_utils.py index acdaadb..4d7815f 100644 --- a/coordinator/utils/processor_utils.py +++ b/ews/coordinator/utils/processor_utils.py @@ -15,10 +15,6 @@ import subprocess import sys import tarfile from typing import List -import netCDF4 as nc -import numpy as np -import pandas as pd -import cf_units from iris import load from iris.cube import CubeList @@ -356,7 +352,9 @@ def setup_logging(job_file_path: str, is_live: bool, log_level: str): # if there is no value set for the LOGGING_CONFIG file, set a default path. if not 'LOGGING_CONFIG' in os.environ: - import coordinator + from ews import coordinator + + log_config_path_project = os.path.join(os.path.dirname(coordinator.__file__), "..", "configs", "logger", "template_log_config.json") print(f"ENVIRONMENT VARIABLE 'LOGGING_CONFIG' IS NOT SET, UISING DEFAULT FILE - {log_config_path_project}") else: diff --git a/tests/integration/full/full_test_advisory.py b/tests/integration/full/full_test_advisory.py index 2337747..a4f989b 100644 --- a/tests/integration/full/full_test_advisory.py +++ b/tests/integration/full/full_test_advisory.py @@ -2,10 +2,10 @@ import copy import os import sys -from coordinator.processor_advisory import ProcessorAdvisory -from coordinator.processor_deposition import ProcessorDeposition -from coordinator.processor_environment import ProcessorEnvironment -from coordinator.processor_surveys import ProcessorSurveys +from ews.coordinator import ProcessorAdvisory +from ews.coordinator import ProcessorDeposition +from ews.coordinator import ProcessorEnvironment +from ews.coordinator.processor_surveys import ProcessorSurveys from integration.partial.integration_test_utils import IntegrationTestUtils from integration.test_suites.advisory_test_suite import BaseAdvisoryTestSuite diff --git a/tests/integration/full/full_test_deposition.py b/tests/integration/full/full_test_deposition.py index c07e3af..990d494 100644 --- a/tests/integration/full/full_test_deposition.py +++ b/tests/integration/full/full_test_deposition.py @@ -2,7 +2,7 @@ import copy import os import sys -from coordinator.processor_deposition import ProcessorDeposition +from ews.coordinator import ProcessorDeposition from integration.partial.integration_test_utils import IntegrationTestUtils from integration.test_suites.depo_test_suite import BaseDepoTestSuite diff --git a/tests/integration/full/full_test_env_suit.py b/tests/integration/full/full_test_env_suit.py index 8d1989f..3a70b2d 100644 --- a/tests/integration/full/full_test_env_suit.py +++ b/tests/integration/full/full_test_env_suit.py @@ -2,7 +2,7 @@ import copy import os import sys -from coordinator.processor_environment import ProcessorEnvironment +from ews.coordinator import ProcessorEnvironment from integration.partial.integration_test_utils import IntegrationTestUtils from integration.test_suites.env_suit_test_suite import BaseEnvSuitTestSuite diff --git a/tests/integration/full/full_test_epi.py b/tests/integration/full/full_test_epi.py index 8027cde..c690ccc 100644 --- a/tests/integration/full/full_test_epi.py +++ b/tests/integration/full/full_test_epi.py @@ -2,9 +2,9 @@ import copy import os import sys -from coordinator.processor_deposition import ProcessorDeposition -from coordinator.processor_environment import ProcessorEnvironment -from coordinator.processor_epidemiology import ProcessorEpidemiology +from ews.coordinator import ProcessorDeposition +from ews.coordinator import ProcessorEnvironment +from ews.coordinator.processor_epidemiology import ProcessorEpidemiology from integration.partial.integration_test_utils import IntegrationTestUtils from integration.test_suites.epi_test_suite import BaseEpiTestSuite diff --git a/tests/integration/full/full_test_survey.py b/tests/integration/full/full_test_survey.py index cff7c65..b6c8ae6 100644 --- a/tests/integration/full/full_test_survey.py +++ b/tests/integration/full/full_test_survey.py @@ -2,7 +2,7 @@ import copy import os import sys -from coordinator.processor_surveys import ProcessorSurveys +from ews.coordinator.processor_surveys import ProcessorSurveys from integration.partial.integration_test_utils import IntegrationTestUtils from integration.test_suites.survey_test_suite import BaseSurveyTestSuite diff --git a/tests/integration/partial/integration_test_utils.py b/tests/integration/partial/integration_test_utils.py index c32955f..9a02b0c 100644 --- a/tests/integration/partial/integration_test_utils.py +++ b/tests/integration/partial/integration_test_utils.py @@ -4,13 +4,13 @@ import glob import json import os -from typing import List, Type +from typing import List from unittest import TestSuite, TestLoader, TestCase, TestResult from zipfile import ZipFile from HTMLTestRunner import HTMLTestRunner -from coordinator.processor_base import ProcessorBase +from ews.coordinator.processor_base import ProcessorBase class IntegrationTestUtils: diff --git a/tests/integration/partial/test_advisory.py b/tests/integration/partial/test_advisory.py index d0b01ce..2ca6ef8 100644 --- a/tests/integration/partial/test_advisory.py +++ b/tests/integration/partial/test_advisory.py @@ -2,7 +2,7 @@ import copy import os import unittest -from coordinator.processor_advisory import ProcessorAdvisory +from ews.coordinator.processor_advisory import ProcessorAdvisory from integration.partial.integration_test_utils import IntegrationTestUtils from integration.test_suites.advisory_test_suite import BaseAdvisoryTestSuite diff --git a/tests/integration/partial/test_deposition.py b/tests/integration/partial/test_deposition.py index 28cd5d4..f8f214c 100644 --- a/tests/integration/partial/test_deposition.py +++ b/tests/integration/partial/test_deposition.py @@ -2,7 +2,7 @@ import copy import os import unittest -from coordinator.processor_deposition import ProcessorDeposition +from ews.coordinator.processor_deposition import ProcessorDeposition from integration.partial.integration_test_utils import IntegrationTestUtils from integration.test_suites.depo_test_suite import BaseDepoTestSuite diff --git a/tests/integration/partial/test_env_suit.py b/tests/integration/partial/test_env_suit.py index 3ba4286..38bde21 100644 --- a/tests/integration/partial/test_env_suit.py +++ b/tests/integration/partial/test_env_suit.py @@ -2,7 +2,7 @@ import copy import os import unittest -from coordinator.processor_environment import ProcessorEnvironment +from ews.coordinator.processor_environment import ProcessorEnvironment from integration.partial.integration_test_utils import IntegrationTestUtils from integration.test_suites.env_suit_test_suite import BaseEnvSuitTestSuite diff --git a/tests/integration/partial/test_epi.py b/tests/integration/partial/test_epi.py index d2ec40a..6583761 100644 --- a/tests/integration/partial/test_epi.py +++ b/tests/integration/partial/test_epi.py @@ -2,7 +2,7 @@ import copy import os import unittest -from coordinator.processor_epidemiology import ProcessorEpidemiology +from ews.coordinator.processor_epidemiology import ProcessorEpidemiology from integration.partial.integration_test_utils import IntegrationTestUtils from integration.test_suites.epi_test_suite import BaseEpiTestSuite diff --git a/tests/integration/partial/test_survey.py b/tests/integration/partial/test_survey.py index 2a48e16..0d7c2f8 100644 --- a/tests/integration/partial/test_survey.py +++ b/tests/integration/partial/test_survey.py @@ -2,7 +2,7 @@ import copy import os import unittest -from coordinator.processor_surveys import ProcessorSurveys +from ews.coordinator.processor_surveys import ProcessorSurveys from integration.partial.integration_test_utils import IntegrationTestUtils from integration.test_suites.survey_test_suite import BaseSurveyTestSuite -- GitLab