chore: change some module name

Signed-off-by: develop-cs <[email protected]>

.github/workflows/ci-cd.yml

@@ -15,7 +15,7 @@
 
     jobs:
       verify:
-        name: Apply pre-commit hooks and launch tests
+        name: Pre-commit hooks and Tests
         runs-on: ubuntu-latest
         steps:
           - name: Checkout

src/meteole/__init__.py

@@ -3,10 +3,9 @@
 
 from meteole._arome import AromeForecast
 from meteole._arpege import ArpegeForecast
-from meteole._client import MeteoFranceClient
 from meteole._vigilance import Vigilance
 
-__all__ = ["AromeForecast", "ArpegeForecast", "MeteoFranceClient", "Vigilance"]
+__all__ = ["AromeForecast", "ArpegeForecast", "Vigilance"]
 
 __version__ = version("meteole")
 

src/meteole/_vigilance.py

@@ -5,13 +5,14 @@
 import matplotlib.pyplot as plt
 import pandas as pd
 
-from meteole import _client, const
+from meteole import const
+from meteole.client import MeteoFranceClient
 from meteole.errors import MissingDataError
 
 logger = logging.getLogger(__name__)
 
 
-class Vigilance(_client.MeteoFranceClient):
+class Vigilance(MeteoFranceClient):
     """Wrapper around the meteo-France API for the vigilance data.
     Ressources are:
     - textesvigilance

src/meteole/forecast.py

@@ -4,21 +4,21 @@
 import os
 import shutil
 import tempfile
-from abc import abstractmethod
+from abc import ABC, abstractmethod
 from pathlib import Path
 
 import pandas as pd
 import xarray as xr
 import xmltodict
 
 from meteole import const
-from meteole._client import MeteoFranceClient
+from meteole.client import MeteoFranceClient
 from meteole.errors import MissingDataError
 
 logger = logging.getLogger(__name__)
 
 
-class Forecast(MeteoFranceClient):
+class Forecast(ABC, MeteoFranceClient):
     """
     Provides a unified interface to query AROME and ARPEGE endpoints
 

tests/test_core.py

@@ -2,7 +2,7 @@
 
 import pytest
 
-from meteole._client import MeteoFranceClient
+from meteole.client import MeteoFranceClient
 
 
 def test_init_with_api_key():
@@ -19,7 +19,7 @@ def test_init_with_token():
     assert api.application_id is None
 
 
-@patch("meteole._client.MeteoFranceClient.connect")
+@patch("meteole.client.MeteoFranceClient.connect")
 def test_init_with_application_id(mock_connect):
     api = MeteoFranceClient(application_id="dummy_app_id")
     assert api.application_id == "dummy_app_id"

tests/test_forecast.py

@@ -310,7 +310,7 @@ def test_validate_parameters(self, mock_get_capabilities):
             arpege_forecast._validate_parameters()
 
     @patch("meteole._arpege.ArpegeForecast.get_capabilities")
-    @patch("meteole._client.MeteoFranceClient.connect")
+    @patch("meteole.client.MeteoFranceClient.connect")
     def test_entry_point(self, mock_MeteoFranceClient_connect, mock_get_capabilities):
         territory = "EUROPE"
         arpege_forecast = ArpegeForecast(territory=territory)