Merge branch 'develop' into docs/profiling_databases

requirements.txt

@@ -1,4 +1,4 @@
-scipy>=1.4.1, <1.11
+scipy>=1.4.1, <1.12
 pandas>1.1, <2.1, !=1.4.0
 matplotlib>=3.2, <4
 pydantic>=1.8.1, <2

src/ydata_profiling/profile_report.py

@@ -199,11 +199,11 @@ def __initialize_dataframe(
             and report_config.vars.timeseries.active
             and report_config.vars.timeseries.sortby
         ):
-            return df.sort_values(by=report_config.vars.timeseries.sortby).reset_index(
-                drop=True
-            )
-        else:
-            return df
+            df = df.sort_values(by=report_config.vars.timeseries.sortby)
+            df = df.set_index(report_config.vars.timeseries.sortby, drop=False)
+            df.index.name = None
+
+        return df
 
     def invalidate_cache(self, subset: Optional[str] = None) -> None:
         """Invalidate report cache. Useful after changing setting.

src/ydata_profiling/report/structure/variables/render_timeseries.py

@@ -281,8 +281,16 @@ def render_timeseries(config: Settings, summary: dict) -> dict:
         anchor_id=f"{varid}acf_pacf",
     )
 
+    ts_plot = Image(
+        mini_ts_plot(config, summary["series"], figsize=(7, 3)),
+        image_format=image_format,
+        alt="Time-series plot",
+        name="Time-series",
+        anchor_id=f"{varid}_ts_plot",
+    )
+
     template_variables["bottom"] = Container(
-        [statistics, hist, fq, evs, acf_pacf],
+        [statistics, hist, ts_plot, fq, evs, acf_pacf],
         sequence_type="tabs",
         anchor_id=f"{varid}bottom",
     )

src/ydata_profiling/visualisation/plot.py

@@ -9,6 +9,7 @@
 from matplotlib import pyplot as plt
 from matplotlib.collections import PolyCollection
 from matplotlib.colors import Colormap, LinearSegmentedColormap, ListedColormap, rgb2hex
+from matplotlib.dates import AutoDateLocator, ConciseDateFormatter
 from matplotlib.patches import Patch
 from matplotlib.ticker import FuncFormatter
 from statsmodels.graphics.tsaplots import plot_acf, plot_pacf
@@ -544,6 +545,18 @@ def create_comparison_color_list(config: Settings) -> List[str]:
     return colors
 
 
+def _format_ts_date_axis(
+    series: pd.Series,
+    axis: matplotlib.axis.Axis,
+) -> matplotlib.axis.Axis:
+    if isinstance(series.index, pd.DatetimeIndex):
+        locator = AutoDateLocator()
+        axis.xaxis.set_major_locator(locator)
+        axis.xaxis.set_major_formatter(ConciseDateFormatter(locator))
+
+    return axis
+
+
 def _plot_timeseries(
     config: Settings,
     series: Union[list, pd.Series],
@@ -564,23 +577,31 @@ def _plot_timeseries(
         colors = create_comparison_color_list(config)
 
         for serie, color, label in zip(series, colors, labels):
-            serie.plot(color=color, label=label)
+            ax = serie.plot(color=color, label=label, alpha=0.75)
+            _format_ts_date_axis(serie, ax)
 
     else:
-        series.plot(color=config.html.style.primary_colors[0])
+        ax = series.plot(color=config.html.style.primary_colors[0])
+        _format_ts_date_axis(series, ax)
 
     return plot
 
 
 @manage_matplotlib_context()
-def mini_ts_plot(config: Settings, series: Union[list, pd.Series]) -> str:
+def mini_ts_plot(
+    config: Settings,
+    series: Union[list, pd.Series],
+    figsize: Tuple[float, float] = (3, 2.25),
+) -> str:
     """Plot an time-series plot of the data.
     Args:
-      series: The data to plot.
+        config: profiling settings.
+        series: The data to plot.
+        figsize: The size of the figure (width, height) in inches, default (3, 2.25)
     Returns:
-      The resulting timeseries plot encoded as a string.
+        The resulting timeseries plot encoded as a string.
     """
-    plot = _plot_timeseries(config, series, figsize=(3, 2.25))
+    plot = _plot_timeseries(config, series, figsize=figsize)
     plot.xaxis.set_tick_params(rotation=45)
     plt.rc("ytick", labelsize=3)