Refactoring of Argo stores

argopy/data_fetchers/gdac_index.py

@@ -9,7 +9,6 @@
 from abc import ABC, abstractmethod
 import warnings
 import logging
-import importlib
 
 from ..utils.format import format_oneline
 from ..options import OPTIONS, check_gdac_option
@@ -19,15 +18,6 @@
 
 log = logging.getLogger("argopy.gdac.index")
 
-# has_pyarrow = importlib.util.find_spec('pyarrow') is not None
-# if has_pyarrow:
-#     from argopy.stores.argo_index_pa import indexstore_pyarrow as indexstore
-#     log.debug("Using pyarrow indexstore")
-# else:
-#     from argopy.stores.argo_index_pd import indexstore_pandas as indexstore
-#     # warnings.warn("Consider installing pyarrow in order to improve performances when fetching GDAC data")
-#     log.debug("Using pandas indexstore")
-
 access_points = ["wmo", "box"]
 exit_formats = ["xarray"]
 dataset_ids = ["phy", "bgc"]  # First is default

argopy/stores/__init__.py

@@ -1,30 +1,35 @@
-# from .argo_index_deprec import indexstore, indexfilter_wmo, indexfilter_box
+from .implementations.local import filestore
+from .implementations.memory import memorystore
+from .implementations.http import httpstore
+from .implementations.http_erddap import httpstore_erddap
+from .implementations.ftp import ftpstore
+from .implementations.s3 import s3store
+from .implementations.gdac import gdacfs
 
-from .filesystems import argo_store_proto
-from .filesystems import filestore, httpstore, memorystore, ftpstore, s3store, gdacfs
-from .filesystems import httpstore_erddap, httpstore_erddap_auth
-from .filesystems import has_distributed, distributed  # noqa: F401
+from .index.argo_index import ArgoIndex
+from .float.argo_float import ArgoFloat
 
-from .argo_index_pa import indexstore_pyarrow as indexstore_pa
-from .argo_index_pd import indexstore_pandas as indexstore_pd
+from .kerchunker import ArgoKerchunker
 
-from .argo_index import ArgoIndex
-from .float.argo_float import ArgoFloat
+from .filesystems import has_distributed, distributed  # noqa: F401
+from .spec import ArgoStoreProto  # noqa: F401
+from .implementations.http_erddap import httpstore_erddap_auth  # noqa: F401
 
+from .index.implementations.index_pyarrow import (
+    indexstore as indexstore_pa,
+)  # noqa: F401
+from .index.implementations.index_pandas import (
+    indexstore as indexstore_pd,
+)  # noqa: F401
 
-from .kerchunker import ArgoKerchunker
 
-#
 __all__ = (
     # Classes:
     "ArgoIndex",
     "ArgoFloat",
-    "indexstore_pa",
-    "indexstore_pd",
     "filestore",
     "httpstore",
     "httpstore_erddap",
-    "httpstore_erddap_auth",
     "ftpstore",
     "memorystore",
     "s3store",