Fix dev readme and formatting.

CHANGELOG.md

@@ -12,6 +12,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/).
 
 ### Fixed
  - Fixed issue with calendar generation when the (rightmost) target period crossed into the new year ([#70](https://github.com/AI4S2S/lilio/pull/70)).
+ - Fixed issue with Pandas 2.2 where 'M' changed to 'ME' ([#71](https://github.com/AI4S2S/lilio/pull/71))
+  - Fixed issue where pd.Interval now shows time where it is not wanted ([#71](https://github.com/AI4S2S/lilio/pull/71)). The issue was raised with Pandas ([#57748] https://github.com/pandas-dev/pandas/issues/57748).
 
 ## 0.4.2 (2024-01-19)
 ### Changed

docs/README.dev.md

@@ -47,21 +47,19 @@ This runs tests and prints the results to the command line, as well as storing t
 
 ## Running linters locally
 
-For linting and code style we use `ruff`, `black` and `isort`. We additionally use `mypy` to check the type hints.
+For linting and code style we use `ruff`. We additionally use `mypy` to check the type hints.
 All tools can simply be run by doing:
 
 ```shell
 hatch run lint
 ```
 
-To easily comply with `black` and `isort`, you can also run:
+To comply with formatting you can run:
 
 ```shell
 hatch run format
 ```
 
-This will apply the `black` and `isort` formatting, and then check the code style.
-
 ## Generating the documentation
 To generate the documentation, simply run the following command. This will also test the documentation code snippets. Note that you might need to install [`pandoc`](https://pandoc.org/) to be able to generate the documentation.
 

lilio/_bokeh_plots.py

@@ -1,4 +1,5 @@
 """Calendar plotting implementations (bokeh specific code)."""
+
 import sys
 import typing
 import numpy as np

lilio/_plot.py

@@ -1,4 +1,5 @@
 """Calendar plotting implementations (general and matplotlib)."""
+
 import typing
 import matplotlib.pyplot as plt
 import numpy as np

lilio/calendar.py

@@ -1,4 +1,5 @@
 """Lilio's main Calendar module."""
+
 import copy
 import re
 import warnings
@@ -576,7 +577,7 @@ def show(self) -> pd.DataFrame:
         """
         df = self.get_intervals()
         df = df.astype("str")
- 
+
         for i in range(df.shape[0]):
             df.iloc[i] = [el.replace(" 00:00:00", "") for el in df.iloc[i].values]
 

lilio/calendar_shifter.py

@@ -1,4 +1,5 @@
 """Calendar shifter to create staggered calendars."""
+
 import copy
 from typing import Union
 import xarray as xr

lilio/calendar_shorthands.py

@@ -1,4 +1,5 @@
 """Shorthands for calendars, to make generating commonly used calendars a one-liner."""
+
 import re
 import pandas as pd
 from .calendar import Calendar

lilio/resampling.py

@@ -1,4 +1,5 @@
 """The implementation of the resampling methods for use with the Calendar."""
+
 import typing
 from typing import Callable
 from typing import Literal
@@ -244,22 +245,19 @@ def _resample_dataset(
 
 
 @overload
-def resample(calendar: Calendar, input_data: xr.Dataset) -> xr.Dataset:
-    ...
+def resample(calendar: Calendar, input_data: xr.Dataset) -> xr.Dataset: ...
 
 
 @overload
-def resample(calendar: Calendar, input_data: xr.DataArray) -> xr.DataArray:
-    ...
+def resample(calendar: Calendar, input_data: xr.DataArray) -> xr.DataArray: ...
 
 
 @overload
 def resample(
     calendar: Calendar, input_data: Union[pd.Series, pd.DataFrame]
-) -> pd.DataFrame:
-    ...
-
+) -> pd.DataFrame: ...
 
+# ruff: noqa: E501 / Ignoring line length issue until pd.Interval fixed to drop time. 
 def resample(
     calendar: Calendar,
     input_data: Union[pd.Series, pd.DataFrame, xr.DataArray, xr.Dataset],

lilio/traintest.py

@@ -2,6 +2,7 @@
 
 Wrapper around sklearn splitters for working with (multiple) xarray dataarrays.
 """
+
 from collections.abc import Iterable
 from typing import Optional
 from typing import Union
@@ -56,8 +57,7 @@ def split(
         x_args: xr.DataArray,
         y: Optional[xr.DataArray] = None,
         dim: str = "anchor_year",
-    ) -> Iterable[tuple[xr.DataArray, xr.DataArray, xr.DataArray, xr.DataArray]]:
-        ...
+    ) -> Iterable[tuple[xr.DataArray, xr.DataArray, xr.DataArray, xr.DataArray]]: ...
 
     @overload
     def split(
@@ -69,8 +69,7 @@ def split(
         tuple[
             Iterable[xr.DataArray], Iterable[xr.DataArray], xr.DataArray, xr.DataArray
         ]
-    ]:
-        ...
+    ]: ...
 
     def split(
         self,

lilio/utils.py

@@ -1,4 +1,5 @@
 """Commonly used utility functions for Lilio."""
+
 import re
 import typing
 import warnings
@@ -115,8 +116,8 @@ def infer_input_data_freq(
         if data_freq is None:  # Manually infer the frequency
             data_freq = (data.time.values[1:] - data.time.values[:-1]).min()
 
-    if "ME" or "MS" in data_freq: 
-        data_freq = data_freq.replace("ME","M").replace("MS", "M")
+    if "ME" or "MS" in data_freq:
+        data_freq = data_freq.replace("ME", "M").replace("MS", "M")
 
     if isinstance(data_freq, str):
         data_freq.replace("-", "")  # Get the absolute frequency

tests/test_calendar.py

@@ -1,5 +1,5 @@
-"""Tests for the lilio.Calendar module.
-"""
+"""Tests for the lilio.Calendar module."""
+
 from typing import Literal
 import numpy as np
 import pandas as pd

tests/test_calendar_shifter.py

@@ -1,4 +1,5 @@
 """Tests for the s2s.nwp_calendar module."""
+
 import copy
 import numpy as np
 import pandas as pd

tests/test_plots.py

@@ -1,4 +1,5 @@
 """Tests for the lilio._bokeh_plots module."""
+
 import matplotlib as mpl
 import matplotlib.pyplot as plt
 import pytest

tests/test_resample.py

@@ -1,5 +1,5 @@
-"""Tests for lilio's resample module.
-"""
+"""Tests for lilio's resample module."""
+
 import tempfile
 from pathlib import Path
 import numpy as np

tests/test_traintest.py

@@ -1,4 +1,5 @@
 """Tests for Lilio's traintest module."""
+
 import numpy as np
 import pandas as pd
 import pytest