Merge branch 'issure/remove-imports'

Author: peterdudfield

conftest.py

@@ -7,8 +7,8 @@
 import nowcasting_dataset
 from nowcasting_dataset import consts
 from nowcasting_dataset.config.load import load_yaml_configuration
-from nowcasting_dataset.data_sources import SatelliteDataSource
 from nowcasting_dataset.data_sources.gsp.gsp_data_source import GSPDataSource
+from nowcasting_dataset.data_sources.satellite.satellite_data_source import SatelliteDataSource
 
 pytest.IMAGE_SIZE_PIXELS = 128
 

nowcasting_dataset/data_sources/__init__.py renamed to nowcasting_dataset/data_sources/map.py

@@ -10,7 +10,7 @@
 import xarray as xr
 
 import nowcasting_dataset.filesystem.utils as nd_fs_utils
-from nowcasting_dataset.data_sources import DataSource
+from nowcasting_dataset.data_sources.data_source import DataSource
 from nowcasting_dataset.data_sources.metadata.metadata_model import SpaceTimeLocation
 from nowcasting_dataset.data_sources.optical_flow.format_images import crop_center, remap_image
 from nowcasting_dataset.data_sources.optical_flow.optical_flow_model import OpticalFlow
@@ -82,7 +82,10 @@ def __post_init__(self):  # noqa
         super().__post_init__()
 
         # Get round circular import problem
-        from nowcasting_dataset.data_sources import HRVSatelliteDataSource, SatelliteDataSource
+        from nowcasting_dataset.data_sources.satellite.satellite_data_source import (
+            HRVSatelliteDataSource,
+            SatelliteDataSource,
+        )
 
         _MAP_SATELLITE_DATA_SOURCE_NAME_TO_CLASS = {
             "HRVSatelliteDataSource": HRVSatelliteDataSource,

nowcasting_dataset/data_sources/optical_flow/optical_flow_data_source.py

@@ -13,9 +13,9 @@
 
 from nowcasting_dataset.config.model import Configuration
 from nowcasting_dataset.consts import SPATIAL_AND_TEMPORAL_LOCATIONS_OF_EACH_EXAMPLE_FILENAME
-from nowcasting_dataset.data_sources import MAP_DATA_SOURCE_NAME_TO_CLASS
 from nowcasting_dataset.data_sources.fake.batch import make_fake_batch
 from nowcasting_dataset.data_sources.gsp.gsp_model import GSP
+from nowcasting_dataset.data_sources.map import MAP_DATA_SOURCE_NAME_TO_CLASS
 from nowcasting_dataset.data_sources.metadata.metadata_model import Metadata, load_from_csv
 from nowcasting_dataset.data_sources.nwp.nwp_model import NWP
 from nowcasting_dataset.data_sources.optical_flow.optical_flow_model import OpticalFlow

nowcasting_dataset/dataset/batch.py

@@ -6,7 +6,7 @@
 
 import nowcasting_dataset.utils as nd_utils
 from nowcasting_dataset import config
-from nowcasting_dataset.data_sources import ALL_DATA_SOURCE_NAMES, MAP_DATA_SOURCE_NAME_TO_CLASS
+from nowcasting_dataset.data_sources.map import ALL_DATA_SOURCE_NAMES, MAP_DATA_SOURCE_NAME_TO_CLASS
 
 logger = logging.getLogger(__name__)
 

nowcasting_dataset/manager/base.py

@@ -12,7 +12,7 @@
 import nowcasting_dataset.utils as nd_utils
 from nowcasting_dataset import config
 from nowcasting_dataset.consts import SPATIAL_AND_TEMPORAL_LOCATIONS_OF_EACH_EXAMPLE_FILENAME
-from nowcasting_dataset.data_sources import ALL_DATA_SOURCE_NAMES
+from nowcasting_dataset.data_sources.map import ALL_DATA_SOURCE_NAMES
 from nowcasting_dataset.data_sources.metadata.metadata_model import (
     Metadata,
     SpaceTimeLocation,

nowcasting_dataset/manager/manager.py

@@ -3,8 +3,10 @@
 import pandas as pd
 import pytest
 
-from nowcasting_dataset.data_sources import TopographicDataSource
 from nowcasting_dataset.data_sources.metadata.metadata_model import SpaceTimeLocation
+from nowcasting_dataset.data_sources.topographic.topographic_data_source import (
+    TopographicDataSource,
+)
 
 
 @pytest.mark.parametrize(