Merge pull request #1063 from metno/remove-entry-points

move readers on plugins to io and remove extension entry points

pyaerocom/colocation_auto.py

@@ -7,7 +7,6 @@
 import os
 import traceback
 from datetime import datetime
-from importlib import metadata
 from pathlib import Path
 from typing import Optional
 
@@ -33,6 +32,7 @@
 )
 from pyaerocom.io import ReadGridded, ReadUngridded
 from pyaerocom.io.helpers import get_all_supported_ids_ungridded
+from pyaerocom.io.mscw_ctm.reader import ReadMscwCtm
 from pyaerocom.io.pyaro.pyaro_config import PyaroConfig
 
 logger = logging.getLogger(__name__)
@@ -548,10 +548,7 @@ class Colocator(ColocationSetup):
     as such. For setup attributes, please see base class.
     """
 
-    SUPPORTED_GRIDDED_READERS = {"ReadGridded": ReadGridded}
-    SUPPORTED_GRIDDED_READERS.update(
-        {ep.name: ep.load() for ep in metadata.entry_points(group="pyaerocom.gridded")}
-    )
+    SUPPORTED_GRIDDED_READERS = {"ReadGridded": ReadGridded, "ReadMscwCtm": ReadMscwCtm}
 
     STATUS_CODES = {
         1: "SUCCESS",

pyaerocom/plugins/icos/reader.py → pyaerocom/io/icos/reader.py

@@ -8,7 +8,7 @@
 import xarray as xr
 
 from pyaerocom import const
-from pyaerocom.plugins.mep.reader import ReadMEP
+from pyaerocom.io.mep.reader import ReadMEP
 from pyaerocom.stationdata import StationData
 from pyaerocom.ungriddeddata import UngriddedData
 

pyaerocom/plugins/icpforests/reader.py → pyaerocom/io/icpforests/reader.py

@@ -11,8 +11,8 @@
 
 from pyaerocom import const
 from pyaerocom._lowlevel_helpers import BrowseDict
+from pyaerocom.io.icpforests.metadata import MetadataReader, Station, SurveyYear
 from pyaerocom.io.readungriddedbase import ReadUngriddedBase
-from pyaerocom.plugins.icpforests.metadata import MetadataReader, Station, SurveyYear
 from pyaerocom.stationdata import StationData
 from pyaerocom.ungriddeddata import UngriddedData
 

pyaerocom/io/readungridded.py

@@ -2,7 +2,6 @@
 import os
 import warnings
 from copy import deepcopy
-from importlib import metadata
 from pathlib import Path
 from typing import Optional, Union
 
@@ -12,6 +11,11 @@
 from pyaerocom.helpers import varlist_aerocom
 from pyaerocom.io import ReadUngriddedBase
 from pyaerocom.io.cachehandler_ungridded import CacheHandlerUngridded
+from pyaerocom.io.gaw.reader import ReadGAW
+from pyaerocom.io.ghost.reader import ReadGhost
+from pyaerocom.io.icos.reader import ReadICOS
+from pyaerocom.io.icpforests.reader import ReadICPForest
+from pyaerocom.io.mep.reader import ReadMEP
 from pyaerocom.io.pyaro.pyaro_config import PyaroConfig
 from pyaerocom.io.pyaro.read_pyaro import ReadPyaro
 from pyaerocom.io.read_aasetal import ReadAasEtal
@@ -26,7 +30,6 @@
 from pyaerocom.io.read_ebas import ReadEbas
 from pyaerocom.io.read_eea_aqerep import ReadEEAAQEREP
 from pyaerocom.io.read_eea_aqerep_v2 import ReadEEAAQEREP_V2
-from pyaerocom.plugins.icpforests.reader import ReadICPForest
 from pyaerocom.ungriddeddata import UngriddedData
 from pyaerocom.variable import get_aliases
 
@@ -61,11 +64,12 @@ class ReadUngridded:
         ReadAirNow,
         ReadEEAAQEREP,
         ReadEEAAQEREP_V2,
+        ReadGAW,
+        ReadGhost,
+        ReadMEP,
+        ReadICOS,
         ReadICPForest,
     ]
-    SUPPORTED_READERS.extend(
-        ep.load() for ep in metadata.entry_points(group="pyaerocom.ungridded")
-    )
 
     # Creates list of all readers excluding ReadPyaro
     INCLUDED_READERS = deepcopy(SUPPORTED_READERS)
@@ -266,7 +270,7 @@ def get_reader(self, data_id):
         )
         return self.get_lowlevel_reader(data_id)
 
-    def get_lowlevel_reader(self, data_id=None):
+    def get_lowlevel_reader(self, data_id: str | None = None) -> ReadUngriddedBase:
         """Helper method that returns initiated reader class for input ID
 
         Parameters
@@ -284,16 +288,16 @@ class :class:`ReadUngriddedBase`).
         if data_id is None:
             if len(self.data_ids) != 1:
                 raise ValueError("Please specify dataset")
-        if not data_id in self.supported_datasets:
+        if data_id not in self.supported_datasets:
             if data_id not in self.config_map:
                 raise NetworkNotSupported(
                     f"Could not fetch reader class: Input "
                     f"network {data_id} is not supported by "
                     f"ReadUngridded"
                 )
-        elif not data_id in self.data_ids:
+        elif data_id not in self.data_ids:
             self.data_ids.append(data_id)
-        if not data_id in self._readers:
+        if data_id not in self._readers:
             _cls = self._find_read_class(data_id)
             reader = self._init_lowlevel_reader(_cls, data_id)
             self._readers[data_id] = reader
@@ -880,7 +884,15 @@ def get_vars_supported(self, obs_id, vars_desired):  # , config: Optional[PyaroC
         return obs_vars
 
     def __str__(self):
-        s = ""
-        for ds in self.data_ids:
-            s += f"\n{self.get_lowlevel_reader(ds)}"
-        return s
+        return "\n".join(str(self.get_lowlevel_reader(ds)) for ds in self.data_ids)
+
+    def __str__(self):
+        return "\n".join(str(self.get_lowlevel_reader(ds)) for ds in self.data_ids)
+        return "\n".join(str(self.get_lowlevel_reader(ds)) for ds in self.data_ids)
+
+    def __str__(self):
+        return "\n".join(str(self.get_lowlevel_reader(ds)) for ds in self.data_ids)
+        return "\n".join(str(self.get_lowlevel_reader(ds)) for ds in self.data_ids)
+
+    def __str__(self):
+        return "\n".join(str(self.get_lowlevel_reader(ds)) for ds in self.data_ids)

pyproject.toml

@@ -80,15 +80,6 @@ dev = ["pytest-sugar", "pytest-xdist", "pre-commit"]
 [project.scripts]
 pya = "pyaerocom.scripts.cli:main"
 
-[project.entry-points."pyaerocom.gridded"]
-ReadMscwCtm = "pyaerocom.plugins.mscw_ctm.reader:ReadMscwCtm"
-
-[project.entry-points."pyaerocom.ungridded"]
-ReadGAW = "pyaerocom.plugins.gaw.reader:ReadGAW"
-ReadGhost = "pyaerocom.plugins.ghost.reader:ReadGhost"
-ReadMEP = "pyaerocom.plugins.mep.reader:ReadMEP"
-ReadICOS = "pyaerocom.plugins.icos.reader:ReadICOS"
-ReadICPForest = "pyaerocom.plugins.icpforests.reader:ReadICPForest"
 
 [tool.flit.sdist]
 include = ["LICENSE", "README.*", "pyaerocom_env.yml", "tests"]

tests/fixtures/data_access.py

@@ -12,9 +12,9 @@
 import pooch
 
 from pyaerocom import const, io
+from pyaerocom.io.ghost.reader import ReadGhost
+from pyaerocom.io.icpforests.reader import ReadICPForest
 from pyaerocom.io.readungriddedbase import ReadUngriddedBase
-from pyaerocom.plugins.ghost.reader import ReadGhost
-from pyaerocom.plugins.icpforests.reader import ReadICPForest
 
 logger = logging.getLogger(__name__)
 

tests/plugins/gaw/test_dms.py → tests/io/gaw/test_dms.py

@@ -7,7 +7,7 @@
 from numpy.testing import assert_allclose, assert_array_equal
 
 from pyaerocom import const
-from pyaerocom.plugins.gaw.reader import ReadGAW
+from pyaerocom.io.gaw.reader import ReadGAW
 from tests.conftest import TEST_RTOL
 
 

tests/plugins/ghost/test_meta_keys.py → tests/io/ghost/test_meta_keys.py

@@ -4,7 +4,8 @@
 THESE SHOULD BE ALWAYS THE SAME ACCORDING TO INFORMATION INFORMATION
 PROVIDED BY BSC
 """
-from pyaerocom.plugins.ghost.meta_keys import ghost_meta_keys
+
+from pyaerocom.io.ghost.meta_keys import ghost_meta_keys
 
 desired_keys = [
     "EDGAR_v4.3.2_annual_average_BC_emissions",

tests/plugins/ghost/test_reader.py → tests/io/ghost/test_reader.py

@@ -3,7 +3,7 @@
 import numpy as np
 import pytest
 
-from pyaerocom.plugins.ghost.reader import ReadGhost
+from pyaerocom.io.ghost.reader import ReadGhost
 
 
 @pytest.fixture(scope="module")

tests/plugins/icos/test_reader.py → tests/io/icos/test_reader.py

@@ -5,7 +5,7 @@
 import pytest
 
 from pyaerocom import const
-from pyaerocom.plugins.icos.reader import ReadICOS
+from pyaerocom.io.icos.reader import ReadICOS
 
 if not const.has_access_lustre:
     pytestmark = pytest.skip(

tests/plugins/icpforests/test_reader.py → tests/io/icpforests/test_reader.py

@@ -5,8 +5,8 @@
 import pytest
 
 from pyaerocom import const
-from pyaerocom.plugins.icpforests.metadata import MetadataReader as ReadICPForestMeta
-from pyaerocom.plugins.icpforests.reader import ReadICPForest
+from pyaerocom.io.icpforests.metadata import MetadataReader as ReadICPForestMeta
+from pyaerocom.io.icpforests.reader import ReadICPForest
 from tests.fixtures.data_access import TEST_DATA, DataForTests
 
 # station names are not consistent between variables!

tests/plugins/mep/test_reader.py → tests/io/mep/test_reader.py

@@ -5,7 +5,7 @@
 import pytest
 
 from pyaerocom import const
-from pyaerocom.plugins.mep.reader import ReadMEP
+from pyaerocom.io.mep.reader import ReadMEP
 
 STATION_NAMES = ("1478A", "2706A", "3377A")
 VARS_DEFAULT = {"concco", "concno2", "conco3", "concpm10", "concpm25", "concso2"}

tests/plugins/mscw_ctm/test_additional_variables.py → tests/io/mscw_ctm/test_additional_variables.py

@@ -1,4 +1,4 @@
-from pyaerocom.plugins.mscw_ctm.additional_variables import (
+from pyaerocom.io.mscw_ctm.additional_variables import (
     calc_concNhno3,
     calc_concNnh3,
     calc_concNnh4,

tests/plugins/mscw_ctm/test_model_variables.py → tests/io/mscw_ctm/test_model_variables.py

@@ -1,4 +1,4 @@
-from pyaerocom.plugins.mscw_ctm.model_variables import emep_variables
+from pyaerocom.io.mscw_ctm.model_variables import emep_variables
 
 
 def test_emep_variables():

tests/plugins/mscw_ctm/test_reader.py → tests/io/mscw_ctm/test_reader.py

@@ -10,7 +10,7 @@
 import pyaerocom.exceptions as exc
 from pyaerocom import get_variable
 from pyaerocom.griddeddata import GriddedData
-from pyaerocom.plugins.mscw_ctm.reader import ReadEMEP, ReadMscwCtm
+from pyaerocom.io.mscw_ctm.reader import ReadEMEP, ReadMscwCtm
 from tests.conftest import TEST_RTOL
 from tests.fixtures.mscw_ctm import create_fake_MSCWCtm_data
 

tests/test_colocation.py

@@ -15,7 +15,7 @@
 )
 from pyaerocom.config import ALL_REGION_NAME
 from pyaerocom.exceptions import UnresolvableTimeDefinitionError
-from pyaerocom.plugins.mscw_ctm.reader import ReadMscwCtm
+from pyaerocom.io.mscw_ctm.reader import ReadMscwCtm
 from tests.conftest import TEST_RTOL, need_iris_32
 from tests.fixtures.stations import create_fake_station_data
 

tests/test_colocation_auto.py

@@ -8,7 +8,7 @@
 from pyaerocom.config import ALL_REGION_NAME
 from pyaerocom.exceptions import ColocationError, ColocationSetupError
 from pyaerocom.io.aux_read_cubes import add_cubes
-from pyaerocom.plugins.mscw_ctm.reader import ReadMscwCtm
+from pyaerocom.io.mscw_ctm.reader import ReadMscwCtm
 from tests.fixtures.data_access import TEST_DATA
 
 COL_OUT_DEFAULT = Path(const.OUTPUTDIR) / "colocated_data"