more fixes

docs/notebooks/2_getting_started.ipynb

@@ -1,5 +1,24 @@
 {
  "cells": [
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "eb10a72a-9ea1-4414-922b-0ea1aaea0648",
+   "metadata": {
+    "nbsphinx": "hidden"
+   },
+   "outputs": [],
+   "source": [
+    "# Remove flox spam\n",
+    "\n",
+    "import logging\n",
+    "\n",
+    "# Get the logger for the 'flox' package\n",
+    "logger = logging.getLogger(\"flox\")\n",
+    "# Set the logging level to WARNING\n",
+    "logger.setLevel(logging.WARNING)"
+   ]
+  },
   {
    "cell_type": "markdown",
    "id": "4f220a85",
@@ -1481,7 +1500,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.12"
+   "version": "3.12.2"
   }
  },
  "nbformat": 4,

docs/notebooks/3_diagnostics.ipynb

@@ -1,5 +1,24 @@
 {
  "cells": [
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "d513b8c4-0cb4-429b-b169-e0d8d40c795f",
+   "metadata": {
+    "nbsphinx": "hidden"
+   },
+   "outputs": [],
+   "source": [
+    "# Remove flox spam\n",
+    "\n",
+    "import logging\n",
+    "\n",
+    "# Get the logger for the 'flox' package\n",
+    "logger = logging.getLogger(\"flox\")\n",
+    "# Set the logging level to WARNING\n",
+    "logger.setLevel(logging.WARNING)"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -484,7 +503,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.12"
+   "version": "3.12.2"
   }
  },
  "nbformat": 4,

docs/notebooks/4_ensembles.ipynb

@@ -1,5 +1,23 @@
 {
  "cells": [
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "nbsphinx": "hidden"
+   },
+   "outputs": [],
+   "source": [
+    "# Remove flox spam\n",
+    "\n",
+    "import logging\n",
+    "\n",
+    "# Get the logger for the 'flox' package\n",
+    "logger = logging.getLogger(\"flox\")\n",
+    "# Set the logging level to WARNING\n",
+    "logger.setLevel(logging.WARNING)"
+   ]
+  },
   {
    "cell_type": "markdown",
    "metadata": {},
@@ -36,7 +54,9 @@
     "\n",
     "for d in datasets:\n",
     "    ds = open_dataset(datasets[d]).isel(lon=slice(0, 4), lat=slice(0, 4))\n",
-    "    ds = xs.climatological_mean(ds, window=30, periods=[[1981, 2010], [2021, 2050]])\n",
+    "    ds = xs.climatological_op(\n",
+    "        ds, op=\"mean\", window=30, periods=[[1981, 2010], [2021, 2050]]\n",
+    "    )\n",
     "    datasets[d] = xs.compute_deltas(ds, reference_horizon=\"1981-2010\")\n",
     "    datasets[d].attrs[\"cat:id\"] = d  # Required by build_reduction_data\n",
     "    datasets[d].attrs[\"cat:xrfreq\"] = \"AS-JAN\""
@@ -270,7 +290,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.5"
+   "version": "3.12.2"
   }
  },
  "nbformat": 4,

docs/notebooks/5_warminglevels.ipynb

@@ -1,5 +1,24 @@
 {
  "cells": [
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "f1899896-70a1-4efb-80e6-8765b95f4388",
+   "metadata": {
+    "nbsphinx": "hidden"
+   },
+   "outputs": [],
+   "source": [
+    "# Remove flox spam\n",
+    "\n",
+    "import logging\n",
+    "\n",
+    "# Get the logger for the 'flox' package\n",
+    "logger = logging.getLogger(\"flox\")\n",
+    "# Set the logging level to WARNING\n",
+    "logger.setLevel(logging.WARNING)"
+   ]
+  },
   {
    "cell_type": "markdown",
    "id": "3e311475",
@@ -483,7 +502,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.12"
+   "version": "3.12.2"
   }
  },
  "nbformat": 4,

docs/notebooks/6_config.ipynb

@@ -277,7 +277,7 @@
     "import xarray as xr\n",
     "\n",
     "# Create a dummy dataset\n",
-    "time = pd.date_range(\"1951-01-01\", \"2100-01-01\", freq=\"AS-JAN\")\n",
+    "time = pd.date_range(\"1951-01-01\", \"2100-01-01\", freq=\"YS-JAN\")\n",
     "da = xr.DataArray([0] * len(time), coords={\"time\": time})\n",
     "da.name = \"test\"\n",
     "ds = da.to_dataset()\n",
@@ -378,7 +378,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.11"
+   "version": "3.12.2"
   }
  },
  "nbformat": 4,

xscen/__init__.py

@@ -75,9 +75,3 @@ def warning_on_one_line(
     "Pass observed=False to retain current behavior or observed=True to adopt the future default "
     "and silence this warning.",
 )
-# warnings.filterwarnings(
-#     "ignore",
-#     category=FutureWarning,
-#     module="intake_esm",
-#     message="DataFrame.applymap has been deprecated. Use DataFrame.map instead.",
-# )

xscen/catutils.py

@@ -634,11 +634,13 @@ def parse_directory(  # noqa: C901
 
     # translate xrfreq into frequencies and vice-versa
     if {"xrfreq", "frequency"}.issubset(df.columns):
-        df["xrfreq"].fillna(
-            df["frequency"].apply(CV.frequency_to_xrfreq, default=pd.NA), inplace=True
+        df.fillna(
+            {"xrfreq": df["frequency"].apply(CV.frequency_to_xrfreq, default=pd.NA)},
+            inplace=True,
         )
-        df["frequency"].fillna(
-            df["xrfreq"].apply(CV.xrfreq_to_frequency, default=pd.NA), inplace=True
+        df.fillna(
+            {"frequency": df["xrfreq"].apply(CV.xrfreq_to_frequency, default=pd.NA)},
+            inplace=True,
         )
 
     # Parse dates
@@ -757,7 +759,7 @@ def parse_from_ds(  # noqa: C901
             attrs["variable"] = tuple(sorted(variables))
         elif name in ("frequency", "xrfreq") and time is not None and time.size > 3:
             # round to the minute to catch floating point imprecision
-            freq = xr.infer_freq(time.round("T"))
+            freq = xr.infer_freq(time.round("min"))
             if freq:
                 if "xrfreq" in names:
                     attrs["xrfreq"] = freq