From 4475c61b07c4aab4527ffda46ec170951d8a3922 Mon Sep 17 00:00:00 2001 From: James Date: Sat, 5 Apr 2025 19:34:26 +0100 Subject: [PATCH 1/2] fixed import path --- tests/data/test_pvlive_data.py | 2 +- tests/test_dwd.py | 2 +- tests/test_main.py | 2 +- tests/test_met_office.py | 2 +- tests/test_metadata.py | 4 ++-- tests/test_utils.py | 10 +++++----- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tests/data/test_pvlive_data.py b/tests/data/test_pvlive_data.py index 7a2265e..fbcc9c3 100644 --- a/tests/data/test_pvlive_data.py +++ b/tests/data/test_pvlive_data.py @@ -2,7 +2,7 @@ from unittest.mock import MagicMock from datetime import datetime import pytz -from open_data_pvnet.scripts.fetch_pvlive_data import PVLiveData +from src.open_data_pvnet.scripts.fetch_pvlive_data import PVLiveData @pytest.fixture diff --git a/tests/test_dwd.py b/tests/test_dwd.py index baf9293..84d9d8f 100644 --- a/tests/test_dwd.py +++ b/tests/test_dwd.py @@ -2,7 +2,7 @@ from unittest.mock import Mock from pathlib import Path -from open_data_pvnet.nwp.dwd import ( +from src.open_data_pvnet.nwp.dwd import ( generate_variable_url, fetch_dwd_data, process_dwd_data, diff --git a/tests/test_main.py b/tests/test_main.py index cf42ff4..67bd403 100644 --- a/tests/test_main.py +++ b/tests/test_main.py @@ -1,6 +1,6 @@ import pytest from unittest.mock import patch -from open_data_pvnet.main import ( +from src.open_data_pvnet.main import ( configure_parser, load_env_and_setup_logger, main, diff --git a/tests/test_met_office.py b/tests/test_met_office.py index 1f9250e..7f0145a 100644 --- a/tests/test_met_office.py +++ b/tests/test_met_office.py @@ -1,7 +1,7 @@ import pytest from unittest.mock import Mock -from open_data_pvnet.nwp.met_office import ( +from src.open_data_pvnet.nwp.met_office import ( generate_prefix, fetch_met_office_data, process_met_office_data, diff --git a/tests/test_metadata.py b/tests/test_metadata.py index 9e781a4..f062a40 100644 --- a/tests/test_metadata.py +++ b/tests/test_metadata.py @@ -1,5 +1,5 @@ import tomllib -import open_data_pvnet +import src.open_data_pvnet def test_version_consistency(): @@ -12,7 +12,7 @@ def test_version_consistency(): pyproject_version = pyproject_data["project"]["version"] # Read version from the __init__.py file - init_version = open_data_pvnet.__version__ + init_version = src.open_data_pvnet.__version__ # Assert both versions are the same assert pyproject_version == init_version, ( diff --git a/tests/test_utils.py b/tests/test_utils.py index 128dd79..534b15e 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -9,10 +9,10 @@ import pandas as pd from huggingface_hub.utils import EntryNotFoundError -from open_data_pvnet.utils.config_loader import load_config -from open_data_pvnet.utils.env_loader import load_environment_variables -from open_data_pvnet.utils.data_converters import convert_nc_to_zarr -from open_data_pvnet.utils.data_uploader import ( +from src.open_data_pvnet.utils.config_loader import load_config +from src.open_data_pvnet.utils.env_loader import load_environment_variables +from src.open_data_pvnet.utils.data_converters import convert_nc_to_zarr +from src.open_data_pvnet.utils.data_uploader import ( _validate_config, _validate_token, _ensure_repository, @@ -21,7 +21,7 @@ _upload_archive, upload_to_huggingface, ) -from open_data_pvnet.utils.data_downloader import load_zarr_data, restructure_dataset +from src.open_data_pvnet.utils.data_downloader import load_zarr_data, restructure_dataset # Fixtures From 7d36d4fbd216eaab00bd904904f3d71e3168f15b Mon Sep 17 00:00:00 2001 From: James Date: Sun, 6 Apr 2025 12:43:06 +0100 Subject: [PATCH 2/2] updated the import path --- tests/test_dwd.py | 6 +++++- tests/test_main.py | 8 +++++++- tests/test_met_office.py | 7 ++++++- tests/test_metadata.py | 10 ++++++++-- tests/test_utils.py | 16 ++++++++++------ 5 files changed, 36 insertions(+), 11 deletions(-) diff --git a/tests/test_dwd.py b/tests/test_dwd.py index 84d9d8f..693be74 100644 --- a/tests/test_dwd.py +++ b/tests/test_dwd.py @@ -1,8 +1,12 @@ import pytest from unittest.mock import Mock from pathlib import Path +import sys +import pathlib -from src.open_data_pvnet.nwp.dwd import ( +src_dir = pathlib.Path(__file__).parent.parent / 'src' +sys.path.insert(0, str(src_dir)) +from open_data_pvnet.nwp.dwd import ( generate_variable_url, fetch_dwd_data, process_dwd_data, diff --git a/tests/test_main.py b/tests/test_main.py index 67bd403..9f1437d 100644 --- a/tests/test_main.py +++ b/tests/test_main.py @@ -1,6 +1,12 @@ import pytest from unittest.mock import patch -from src.open_data_pvnet.main import ( +import sys +import pathlib + +src_dir = pathlib.Path(__file__).parent.parent / 'src' +sys.path.insert(0, str(src_dir)) + +from open_data_pvnet.main import ( configure_parser, load_env_and_setup_logger, main, diff --git a/tests/test_met_office.py b/tests/test_met_office.py index 7f0145a..f59c686 100644 --- a/tests/test_met_office.py +++ b/tests/test_met_office.py @@ -1,7 +1,12 @@ import pytest from unittest.mock import Mock +import sys +import pathlib -from src.open_data_pvnet.nwp.met_office import ( +src_dir = pathlib.Path(__file__).parent.parent / 'src' +sys.path.insert(0, str(src_dir)) + +from open_data_pvnet.nwp.met_office import ( generate_prefix, fetch_met_office_data, process_met_office_data, diff --git a/tests/test_metadata.py b/tests/test_metadata.py index f062a40..5104358 100644 --- a/tests/test_metadata.py +++ b/tests/test_metadata.py @@ -1,5 +1,11 @@ import tomllib -import src.open_data_pvnet +import sys +import pathlib + +src_dir = pathlib.Path(__file__).parent.parent / 'src' +sys.path.insert(0, str(src_dir)) + +import open_data_pvnet def test_version_consistency(): @@ -12,7 +18,7 @@ def test_version_consistency(): pyproject_version = pyproject_data["project"]["version"] # Read version from the __init__.py file - init_version = src.open_data_pvnet.__version__ + init_version = open_data_pvnet.__version__ # Assert both versions are the same assert pyproject_version == init_version, ( diff --git a/tests/test_utils.py b/tests/test_utils.py index 534b15e..0aca8e2 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -8,11 +8,15 @@ import yaml import pandas as pd from huggingface_hub.utils import EntryNotFoundError - -from src.open_data_pvnet.utils.config_loader import load_config -from src.open_data_pvnet.utils.env_loader import load_environment_variables -from src.open_data_pvnet.utils.data_converters import convert_nc_to_zarr -from src.open_data_pvnet.utils.data_uploader import ( +import sys +import pathlib + +src_dir = pathlib.Path(__file__).parent.parent / 'src' +sys.path.insert(0, str(src_dir)) +from open_data_pvnet.utils.config_loader import load_config +from open_data_pvnet.utils.env_loader import load_environment_variables +from open_data_pvnet.utils.data_converters import convert_nc_to_zarr +from open_data_pvnet.utils.data_uploader import ( _validate_config, _validate_token, _ensure_repository, @@ -21,7 +25,7 @@ _upload_archive, upload_to_huggingface, ) -from src.open_data_pvnet.utils.data_downloader import load_zarr_data, restructure_dataset +from open_data_pvnet.utils.data_downloader import load_zarr_data, restructure_dataset # Fixtures