Skip to content

Commit

Permalink
Renaming
Browse files Browse the repository at this point in the history
  • Loading branch information
GratienDSX committed Jan 10, 2025
1 parent 51a57b7 commit 4d3dc88
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions src/meteole/forecast.py
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ def _get_coverage_description(self, coverage_id: str) -> dict:
response = self._client.get(url, params=params)
return xmltodict.parse(response.text)

def _grib_str_to_df(self, grib_str: bytes) -> pd.DataFrame:
def _grib_bytes_to_df(self, grib_str: bytes) -> pd.DataFrame:
"""
Converts GRIB data (in binary format) into a pandas DataFrame.
Expand Down Expand Up @@ -440,7 +440,7 @@ def _get_data_single_forecast(
long=long,
)

df = self._grib_str_to_df(grib_str)
df = self._grib_bytes_to_df(grib_str)

# Drop and rename columns
df.drop(columns=["surface", "valid_time"], errors="ignore", inplace=True)
Expand Down
12 changes: 6 additions & 6 deletions tests/test_forecasts.py
Original file line number Diff line number Diff line change
Expand Up @@ -156,10 +156,10 @@ def test_get_coverage_description(self, mock_get_request, mock_get_capabilities)
self.assertIn("wcs:CoverageDescriptions", description)

@patch("meteole._arome.AromeForecast.get_capabilities")
@patch("meteole._arome.AromeForecast._grib_str_to_df")
@patch("meteole._arome.AromeForecast._grib_bytes_to_df")
@patch("meteole._arome.AromeForecast._get_coverage_file")
def test_get_data_single_forecast(self, mock_get_coverage_file, mock_grib_str_to_df, mock_get_capabilities):
mock_grib_str_to_df.return_value = pd.DataFrame({"data": [1, 2, 3]})
def test_get_data_single_forecast(self, mock_get_coverage_file, mock_grib_bytes_to_df, mock_get_capabilities):
mock_grib_bytes_to_df.return_value = pd.DataFrame({"data": [1, 2, 3]})

forecast = AromeForecast(
self.client,
Expand All @@ -179,13 +179,13 @@ def test_get_data_single_forecast(self, mock_get_coverage_file, mock_grib_str_to
self.assertTrue("data" in df.columns)

@patch("meteole._arome.AromeForecast.get_capabilities")
@patch("meteole._arome.AromeForecast._grib_str_to_df")
@patch("meteole._arome.AromeForecast._grib_bytes_to_df")
@patch("meteole._arome.AromeForecast._get_coverage_file")
def test_get_data_single_forecast_with_height(
self, mock_get_coverage_file, mock_grib_str_to_df, mock_get_capabilities
self, mock_get_coverage_file, mock_grib_bytes_to_df, mock_get_capabilities
):
mock_get_coverage_file.return_value = ""
mock_grib_str_to_df.return_value = pd.DataFrame({"data": [1, 2, 3], "heightAboveGround": ["2", "2", "2"]})
mock_grib_bytes_to_df.return_value = pd.DataFrame({"data": [1, 2, 3], "heightAboveGround": ["2", "2", "2"]})

forecast = AromeForecast(
self.client,
Expand Down

0 comments on commit 4d3dc88

Please sign in to comment.