update images and warnings

International-BMP-Database · Feb 19, 2024 · ebc292d · ebc292d
1 parent c4e0994
commit ebc292d
Show file tree

Hide file tree

Showing 135 changed files with 95 additions and 92 deletions.
diff --git a/.github/workflows/python-runtests-img-comp.yml b/.github/workflows/python-runtests-img-comp.yml
@@ -15,22 +15,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Set up Python 3.10
+    - name: Set up Python 3.12
       uses: actions/setup-python@v2
       with:
-        python-version: 3.11
+        python-version: 3.12
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
         pip install flake8 pytest
         if [ -f requirements_dev.txt ]; then pip install -r requirements_dev.txt; fi
-    - name: Lint with flake8
-      run: |
-        # stop the build if there are Python syntax errors or undefined names
-        flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics --exclude .git,docs/*
-        # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-        flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
     - name: Test with pytest
       run: |
         export MPL_IMGCOMP_TOLERANCE=20
-        python check_wqio.py --strict
+        python check_wqio.py --strict --verbose
diff --git a/setup.cfg b/setup.cfg
@@ -1,18 +1,6 @@
 [metadata]
 description-file = readme.rst
 
-[tool:pytest]
-pep8ignore =
-    E501
-    E131
-    check_wqio.py ALL
-    wqio/examples/* ALL
-    wqio/tests/* E501
-    wqio/tests/test_features.py E241
-    wqio/tests/test_datacollections.py E241
-    wqio/tests/test_ros.py E241
-    docs/* ALL
-
 markers =
     mpl_image_compare
 

diff --git a/wqio/datacollections.py b/wqio/datacollections.py
@@ -159,12 +159,12 @@ def fxn(g):
 
             def make_tidy(df):
                 tqdm.pandas(desc="Tidying the DataCollection")
-                return df.groupby(self.groupcols).progress_apply(fxn)
+                return df.groupby(self.groupcols).progress_apply(fxn, include_groups=False)
 
         else:
 
             def make_tidy(df):
-                return df.groupby(self.groupcols).apply(fxn)
+                return df.groupby(self.groupcols).apply(fxn, include_groups=False)
 
         keep_cols = self.tidy_columns + [self.roscol]
         with warnings.catch_warnings():
@@ -277,9 +277,9 @@ def fxn(x):
 
         if tqdm and self.showpbar:
             tqdm.pandas(desc="Computing stats")
-            vals = groups.progress_apply(fxn)
+            vals = groups.progress_apply(fxn, include_groups=False)
         else:
-            vals = groups.apply(fxn)
+            vals = groups.apply(fxn, include_groups=False)
 
         results = (
             vals.unstack(level=self.stationcol)

diff --git a/wqio/features.py b/wqio/features.py
@@ -1292,7 +1292,7 @@ def probplot(
         xlabels = {
             "pp": "Theoretical percentiles",
             "qq": "Theoretical quantiles",
-            "prob": r"Non-exceedance probability (\%)",
+            "prob": r"Non-exceedance probability (%)",
         }
 
         ax.set_xlabel(xlabels[axtype])
@@ -1392,7 +1392,7 @@ def jointplot(self, hist=False, kde=True, rug=True, **scatter_kws):
             Toggles showing histograms on the distribution plots
         kde : bool, optional (default is True)
             Toggles showing KDE plots on the distribution plots
-        run : bool, optional (default is True)
+        rug : bool, optional (default is True)
             Toggles showing rug plots on the distribution plots
         **scatter_kws : keyword arguments
             Optionals passed directly to Dataset.scatterplot
@@ -1405,7 +1405,7 @@ def jointplot(self, hist=False, kde=True, rug=True, **scatter_kws):
         --------
         seaborn.JointGrid
         seaborn.jointplot
-        seaborn.distplot
+        seaborn.displot
         Dataset.scatterplot
 
         """
@@ -1417,7 +1417,7 @@ def jointplot(self, hist=False, kde=True, rug=True, **scatter_kws):
             data = self.paired_data.xs("res", level="quantity", axis=1)
             jg = seaborn.JointGrid(x="inflow", y="outflow", data=data)
             self.scatterplot(ax=jg.ax_joint, showlegend=False, **scatter_kws)
-            jg.plot_marginals(seaborn.distplot, hist=hist, rug=rug, kde=kde)
+            jg.plot_marginals(seaborn.displot, rug=rug, kde=kde)
 
             jg.ax_marg_x.set_xscale(scatter_kws.pop("xscale", "log"))
             jg.ax_marg_y.set_yscale(scatter_kws.pop("yscale", "log"))

diff --git a/wqio/hydro.py b/wqio/hydro.py
@@ -1010,7 +1010,7 @@ def histogram(self, valuecol, bins, **factoropts):
         """
 
         fg = viz.categorical_histogram(self.storm_stats, valuecol, bins, **factoropts)
-        fg.fig.tight_layout()
+        fg.figure.tight_layout()
         return fg
 
 

diff --git a/wqio/tests/_baseline_images/features_tests/test_ds__plot_NDs_both.png b/wqio/tests/_baseline_images/features_tests/test_ds__plot_NDs_both.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_ds__plot_NDs_effluent.png b/wqio/tests/_baseline_images/features_tests/test_ds__plot_NDs_effluent.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_ds__plot_NDs_influent.png b/wqio/tests/_baseline_images/features_tests/test_ds__plot_NDs_influent.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_ds__plot_NDs_neither.png b/wqio/tests/_baseline_images/features_tests/test_ds__plot_NDs_neither.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_ds_boxplot_bacteria_geomean.png b/wqio/tests/_baseline_images/features_tests/test_ds_boxplot_bacteria_geomean.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_ds_boxplot_custom_offset.png b/wqio/tests/_baseline_images/features_tests/test_ds_boxplot_custom_offset.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_ds_boxplot_custom_position.png b/wqio/tests/_baseline_images/features_tests/test_ds_boxplot_custom_position.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_ds_boxplot_default.png b/wqio/tests/_baseline_images/features_tests/test_ds_boxplot_default.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_ds_boxplot_linscale.png b/wqio/tests/_baseline_images/features_tests/test_ds_boxplot_linscale.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_ds_boxplot_no_mean.png b/wqio/tests/_baseline_images/features_tests/test_ds_boxplot_no_mean.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_ds_boxplot_no_notch.png b/wqio/tests/_baseline_images/features_tests/test_ds_boxplot_no_notch.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_ds_boxplot_patch_artists.png b/wqio/tests/_baseline_images/features_tests/test_ds_boxplot_patch_artists.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_ds_boxplot_provided_ax.png b/wqio/tests/_baseline_images/features_tests/test_ds_boxplot_provided_ax.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_ds_boxplot_single_tick.png b/wqio/tests/_baseline_images/features_tests/test_ds_boxplot_single_tick.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_ds_boxplot_single_tick_no_name.png b/wqio/tests/_baseline_images/features_tests/test_ds_boxplot_single_tick_no_name.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_ds_boxplot_width.png b/wqio/tests/_baseline_images/features_tests/test_ds_boxplot_width.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_ds_boxplot_with_ylabel.png b/wqio/tests/_baseline_images/features_tests/test_ds_boxplot_with_ylabel.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_ds_probplot.png b/wqio/tests/_baseline_images/features_tests/test_ds_probplot.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_ds_probplot_clear_yticks.png b/wqio/tests/_baseline_images/features_tests/test_ds_probplot_clear_yticks.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_ds_probplot_default.png b/wqio/tests/_baseline_images/features_tests/test_ds_probplot_default.png
diff --git a/...ests/_baseline_images/features_tests/test_ds_probplot_no_rotate_xticklabels.png b/...ests/_baseline_images/features_tests/test_ds_probplot_no_rotate_xticklabels.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_ds_probplot_ppax.png b/wqio/tests/_baseline_images/features_tests/test_ds_probplot_ppax.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_ds_probplot_provided_ax.png b/wqio/tests/_baseline_images/features_tests/test_ds_probplot_provided_ax.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_ds_probplot_qqax.png b/wqio/tests/_baseline_images/features_tests/test_ds_probplot_qqax.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_ds_probplot_ylabel.png b/wqio/tests/_baseline_images/features_tests/test_ds_probplot_ylabel.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_ds_probplot_yscale_linear.png b/wqio/tests/_baseline_images/features_tests/test_ds_probplot_yscale_linear.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_ds_scatterplot_best_fit.png b/wqio/tests/_baseline_images/features_tests/test_ds_scatterplot_best_fit.png
diff --git a/..._baseline_images/features_tests/test_ds_scatterplot_best_fit_through_origin.png b/..._baseline_images/features_tests/test_ds_scatterplot_best_fit_through_origin.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_ds_scatterplot_default.png b/wqio/tests/_baseline_images/features_tests/test_ds_scatterplot_default.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_ds_scatterplot_no_legend.png b/wqio/tests/_baseline_images/features_tests/test_ds_scatterplot_no_legend.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_ds_scatterplot_no_xlabel.png b/wqio/tests/_baseline_images/features_tests/test_ds_scatterplot_no_xlabel.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_ds_scatterplot_no_ylabel.png b/wqio/tests/_baseline_images/features_tests/test_ds_scatterplot_no_ylabel.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_ds_scatterplot_one2one.png b/wqio/tests/_baseline_images/features_tests/test_ds_scatterplot_one2one.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_ds_scatterplot_provided_ax.png b/wqio/tests/_baseline_images/features_tests/test_ds_scatterplot_provided_ax.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_ds_scatterplot_xlabel.png b/wqio/tests/_baseline_images/features_tests/test_ds_scatterplot_xlabel.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_ds_scatterplot_xscale_linear.png b/wqio/tests/_baseline_images/features_tests/test_ds_scatterplot_xscale_linear.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_ds_scatterplot_xyscale_linear.png b/wqio/tests/_baseline_images/features_tests/test_ds_scatterplot_xyscale_linear.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_ds_scatterplot_ylabel.png b/wqio/tests/_baseline_images/features_tests/test_ds_scatterplot_ylabel.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_ds_scatterplot_yscale_linear.png b/wqio/tests/_baseline_images/features_tests/test_ds_scatterplot_yscale_linear.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_ds_statplot_bacteria_true.png b/wqio/tests/_baseline_images/features_tests/test_ds_statplot_bacteria_true.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_ds_statplot_custom_position.png b/wqio/tests/_baseline_images/features_tests/test_ds_statplot_custom_position.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_ds_statplot_custom_width.png b/wqio/tests/_baseline_images/features_tests/test_ds_statplot_custom_width.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_ds_statplot_no_mean.png b/wqio/tests/_baseline_images/features_tests/test_ds_statplot_no_mean.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_ds_statplot_no_notch.png b/wqio/tests/_baseline_images/features_tests/test_ds_statplot_no_notch.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_ds_statplot_patch_artist.png b/wqio/tests/_baseline_images/features_tests/test_ds_statplot_patch_artist.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_ds_statplot_pp.png b/wqio/tests/_baseline_images/features_tests/test_ds_statplot_pp.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_ds_statplot_qq.png b/wqio/tests/_baseline_images/features_tests/test_ds_statplot_qq.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_ds_statplot_ylabeled.png b/wqio/tests/_baseline_images/features_tests/test_ds_statplot_ylabeled.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_ds_statplot_yscale_linear.png b/wqio/tests/_baseline_images/features_tests/test_ds_statplot_yscale_linear.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_loc_boxplot_bacteria_geomean.png b/wqio/tests/_baseline_images/features_tests/test_loc_boxplot_bacteria_geomean.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_loc_boxplot_custom_position.png b/wqio/tests/_baseline_images/features_tests/test_loc_boxplot_custom_position.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_loc_boxplot_default.png b/wqio/tests/_baseline_images/features_tests/test_loc_boxplot_default.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_loc_boxplot_linscale.png b/wqio/tests/_baseline_images/features_tests/test_loc_boxplot_linscale.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_loc_boxplot_no_mean.png b/wqio/tests/_baseline_images/features_tests/test_loc_boxplot_no_mean.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_loc_boxplot_no_notch.png b/wqio/tests/_baseline_images/features_tests/test_loc_boxplot_no_notch.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_loc_boxplot_patch_artists.png b/wqio/tests/_baseline_images/features_tests/test_loc_boxplot_patch_artists.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_loc_boxplot_provided_ax.png b/wqio/tests/_baseline_images/features_tests/test_loc_boxplot_provided_ax.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_loc_boxplot_width.png b/wqio/tests/_baseline_images/features_tests/test_loc_boxplot_width.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_loc_boxplot_with_xlabel.png b/wqio/tests/_baseline_images/features_tests/test_loc_boxplot_with_xlabel.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_loc_boxplot_with_ylabel.png b/wqio/tests/_baseline_images/features_tests/test_loc_boxplot_with_ylabel.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_loc_probplot.png b/wqio/tests/_baseline_images/features_tests/test_loc_probplot.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_loc_probplot_clear_yticks.png b/wqio/tests/_baseline_images/features_tests/test_loc_probplot_clear_yticks.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_loc_probplot_default.png b/wqio/tests/_baseline_images/features_tests/test_loc_probplot_default.png
diff --git a/...sts/_baseline_images/features_tests/test_loc_probplot_no_rotate_xticklabels.png b/...sts/_baseline_images/features_tests/test_loc_probplot_no_rotate_xticklabels.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_loc_probplot_plotopts1.png b/wqio/tests/_baseline_images/features_tests/test_loc_probplot_plotopts1.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_loc_probplot_plotopts2.png b/wqio/tests/_baseline_images/features_tests/test_loc_probplot_plotopts2.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_loc_probplot_ppax.png b/wqio/tests/_baseline_images/features_tests/test_loc_probplot_ppax.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_loc_probplot_provided_ax.png b/wqio/tests/_baseline_images/features_tests/test_loc_probplot_provided_ax.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_loc_probplot_qqax.png b/wqio/tests/_baseline_images/features_tests/test_loc_probplot_qqax.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_loc_probplot_ylabel.png b/wqio/tests/_baseline_images/features_tests/test_loc_probplot_ylabel.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_loc_probplot_yscale_linear.png b/wqio/tests/_baseline_images/features_tests/test_loc_probplot_yscale_linear.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_loc_statplot_bacteria_true.png b/wqio/tests/_baseline_images/features_tests/test_loc_statplot_bacteria_true.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_loc_statplot_custom_position.png b/wqio/tests/_baseline_images/features_tests/test_loc_statplot_custom_position.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_loc_statplot_custom_width.png b/wqio/tests/_baseline_images/features_tests/test_loc_statplot_custom_width.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_loc_statplot_no_mean.png b/wqio/tests/_baseline_images/features_tests/test_loc_statplot_no_mean.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_loc_statplot_no_notch.png b/wqio/tests/_baseline_images/features_tests/test_loc_statplot_no_notch.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_loc_statplot_patch_artist.png b/wqio/tests/_baseline_images/features_tests/test_loc_statplot_patch_artist.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_loc_statplot_pp.png b/wqio/tests/_baseline_images/features_tests/test_loc_statplot_pp.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_loc_statplot_qq.png b/wqio/tests/_baseline_images/features_tests/test_loc_statplot_qq.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_loc_statplot_ylabeled.png b/wqio/tests/_baseline_images/features_tests/test_loc_statplot_ylabeled.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_loc_statplot_yscale_linear.png b/wqio/tests/_baseline_images/features_tests/test_loc_statplot_yscale_linear.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_loc_vertical_scatter_default.png b/wqio/tests/_baseline_images/features_tests/test_loc_vertical_scatter_default.png
diff --git a/.../tests/_baseline_images/features_tests/test_loc_vertical_scatter_markersize.png b/.../tests/_baseline_images/features_tests/test_loc_vertical_scatter_markersize.png
diff --git a/...sts/_baseline_images/features_tests/test_loc_vertical_scatter_not_ignoreROS.png b/...sts/_baseline_images/features_tests/test_loc_vertical_scatter_not_ignoreROS.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_loc_vertical_scatter_pos.png b/wqio/tests/_baseline_images/features_tests/test_loc_vertical_scatter_pos.png
diff --git a/...tests/_baseline_images/features_tests/test_loc_vertical_scatter_provided_ax.png b/...tests/_baseline_images/features_tests/test_loc_vertical_scatter_provided_ax.png
diff --git a/wqio/tests/_baseline_images/features_tests/test_loc_vertical_scatter_ylabel.png b/wqio/tests/_baseline_images/features_tests/test_loc_vertical_scatter_ylabel.png
diff --git a/...sts/_baseline_images/features_tests/test_loc_vertical_scatter_yscale_linear.png b/...sts/_baseline_images/features_tests/test_loc_vertical_scatter_yscale_linear.png
diff --git a/wqio/tests/_baseline_images/hydro_tests/test_HydroRecord_histogram.png b/wqio/tests/_baseline_images/hydro_tests/test_HydroRecord_histogram.png
diff --git a/wqio/tests/_baseline_images/hydro_tests/test_plot_storm_summary.png b/wqio/tests/_baseline_images/hydro_tests/test_plot_storm_summary.png
diff --git a/wqio/tests/_baseline_images/samples_tests/test_plot_compsample_noStorm_Focus.png b/wqio/tests/_baseline_images/samples_tests/test_plot_compsample_noStorm_Focus.png
diff --git a/.../tests/_baseline_images/samples_tests/test_plot_compsample_noStorm_notFocus.png b/.../tests/_baseline_images/samples_tests/test_plot_compsample_noStorm_notFocus.png
diff --git a/wqio/tests/_baseline_images/samples_tests/test_plot_grabsample_noStorm_asFocus.png b/wqio/tests/_baseline_images/samples_tests/test_plot_grabsample_noStorm_asFocus.png
diff --git a/.../tests/_baseline_images/samples_tests/test_plot_grabsample_noStorm_notFocus.png b/.../tests/_baseline_images/samples_tests/test_plot_grabsample_noStorm_notFocus.png
diff --git a/wqio/tests/_baseline_images/viz_tests/test__connect_spines.png b/wqio/tests/_baseline_images/viz_tests/test__connect_spines.png
diff --git a/wqio/tests/_baseline_images/viz_tests/test_boxplot_basic.png b/wqio/tests/_baseline_images/viz_tests/test_boxplot_basic.png
diff --git a/wqio/tests/_baseline_images/viz_tests/test_boxplot_with_mean.png b/wqio/tests/_baseline_images/viz_tests/test_boxplot_with_mean.png
diff --git a/wqio/tests/_baseline_images/viz_tests/test_categorical_histogram_complex.png b/wqio/tests/_baseline_images/viz_tests/test_categorical_histogram_complex.png
diff --git a/wqio/tests/_baseline_images/viz_tests/test_categorical_histogram_simple.png b/wqio/tests/_baseline_images/viz_tests/test_categorical_histogram_simple.png
diff --git a/wqio/tests/_baseline_images/viz_tests/test_gridlines_basic.png b/wqio/tests/_baseline_images/viz_tests/test_gridlines_basic.png
diff --git a/wqio/tests/_baseline_images/viz_tests/test_gridlines_ylog.png b/wqio/tests/_baseline_images/viz_tests/test_gridlines_ylog.png
diff --git a/wqio/tests/_baseline_images/viz_tests/test_gridlines_ylog_noyminor.png b/wqio/tests/_baseline_images/viz_tests/test_gridlines_ylog_noyminor.png
diff --git a/wqio/tests/_baseline_images/viz_tests/test_jointplot_bothlabeled.png b/wqio/tests/_baseline_images/viz_tests/test_jointplot_bothlabeled.png
diff --git a/wqio/tests/_baseline_images/viz_tests/test_jointplot_defaultlabels.png b/wqio/tests/_baseline_images/viz_tests/test_jointplot_defaultlabels.png
diff --git a/wqio/tests/_baseline_images/viz_tests/test_jointplot_one2one.png b/wqio/tests/_baseline_images/viz_tests/test_jointplot_one2one.png
diff --git a/wqio/tests/_baseline_images/viz_tests/test_jointplot_one2one_zerominFalse.png b/wqio/tests/_baseline_images/viz_tests/test_jointplot_one2one_zerominFalse.png
diff --git a/wqio/tests/_baseline_images/viz_tests/test_jointplot_xlabeled.png b/wqio/tests/_baseline_images/viz_tests/test_jointplot_xlabeled.png
diff --git a/wqio/tests/_baseline_images/viz_tests/test_jointplot_ylabeled.png b/wqio/tests/_baseline_images/viz_tests/test_jointplot_ylabeled.png
diff --git a/wqio/tests/_baseline_images/viz_tests/test_jointplot_zerominFalse.png b/wqio/tests/_baseline_images/viz_tests/test_jointplot_zerominFalse.png
diff --git a/wqio/tests/_baseline_images/viz_tests/test_log_formatter.png b/wqio/tests/_baseline_images/viz_tests/test_log_formatter.png
diff --git a/wqio/tests/_baseline_images/viz_tests/test_log_formatter_alt.png b/wqio/tests/_baseline_images/viz_tests/test_log_formatter_alt.png
diff --git a/wqio/tests/_baseline_images/viz_tests/test_log_formatter_alt_2.png b/wqio/tests/_baseline_images/viz_tests/test_log_formatter_alt_2.png
diff --git a/wqio/tests/_baseline_images/viz_tests/test_one2one.png b/wqio/tests/_baseline_images/viz_tests/test_one2one.png
diff --git a/wqio/tests/_baseline_images/viz_tests/test_probplot_pp.png b/wqio/tests/_baseline_images/viz_tests/test_probplot_pp.png
diff --git a/wqio/tests/_baseline_images/viz_tests/test_probplot_pp_bestfit.png b/wqio/tests/_baseline_images/viz_tests/test_probplot_pp_bestfit.png
diff --git a/wqio/tests/_baseline_images/viz_tests/test_probplot_prob.png b/wqio/tests/_baseline_images/viz_tests/test_probplot_prob.png
diff --git a/wqio/tests/_baseline_images/viz_tests/test_probplot_prob_bestfit.png b/wqio/tests/_baseline_images/viz_tests/test_probplot_prob_bestfit.png
diff --git a/wqio/tests/_baseline_images/viz_tests/test_probplot_qq.png b/wqio/tests/_baseline_images/viz_tests/test_probplot_qq.png
diff --git a/wqio/tests/_baseline_images/viz_tests/test_probplot_qq_bestfit.png b/wqio/tests/_baseline_images/viz_tests/test_probplot_qq_bestfit.png
diff --git a/wqio/tests/_baseline_images/viz_tests/test_rotateTickLabels_both.png b/wqio/tests/_baseline_images/viz_tests/test_rotateTickLabels_both.png
diff --git a/wqio/tests/_baseline_images/viz_tests/test_rotateTickLabels_xaxis.png b/wqio/tests/_baseline_images/viz_tests/test_rotateTickLabels_xaxis.png
diff --git a/wqio/tests/_baseline_images/viz_tests/test_rotateTickLabels_yaxis.png b/wqio/tests/_baseline_images/viz_tests/test_rotateTickLabels_yaxis.png
diff --git a/wqio/tests/helpers.py b/wqio/tests/helpers.py
@@ -1,5 +1,4 @@
 import difflib
-import distutils
 import os
 import re
 import subprocess
@@ -12,6 +11,7 @@
 import numpy
 import pandas
 import pytest
+from packaging.version import Version
 from pkg_resources import resource_filename
 
 
@@ -189,8 +189,8 @@ def compare_versions(utility="latex"):  # pragma: no cover
     required = requirements[utility]
     present = available[utility]
     if present:
-        present = distutils.version.LooseVersion(present)
-        required = distutils.version.LooseVersion(required)
+        present = Version(present)
+        required = Version(required)
         return present >= required
 
     else:

diff --git a/wqio/tests/test_datacollections.py b/wqio/tests/test_datacollections.py
@@ -1,4 +1,3 @@
-from distutils.version import LooseVersion
 from io import StringIO
 from textwrap import dedent
 from unittest import mock
@@ -8,13 +7,14 @@
 import pandas.testing as pdtest
 import pytest
 import scipy
+from packaging.version import Version
 from scipy import stats
 
 from wqio.datacollections import DataCollection, _dist_compare
 from wqio.features import Dataset, Location
 from wqio.tests import helpers
 
-OLD_SCIPY = LooseVersion(scipy.version.version) < LooseVersion("0.19")
+OLD_SCIPY = Version(scipy.version.version) < Version("0.19")
 
 
 def check_stat(expected_csv, result, comp=False):

diff --git a/wqio/tests/test_features.py b/wqio/tests/test_features.py
@@ -1,14 +1,13 @@
-from distutils.version import LooseVersion
-
 import numpy.testing as nptest
 import pandas
 import pytest
 import scipy
+from packaging.version import Version
 
 from wqio.features import Dataset, Location
 from wqio.tests import helpers
 
-OLD_SCIPY = LooseVersion(scipy.version.version) < LooseVersion("0.19")
+OLD_SCIPY = Version(scipy.version.version) < Version("0.19")
 TOLERANCE = 0.05
 
 

diff --git a/wqio/tests/test_features_plotting.py b/wqio/tests/test_features_plotting.py
@@ -1,12 +1,10 @@
-import pytest
-from wqio.tests import helpers
-
 import numpy
-from matplotlib import pyplot
+import pytest
 import seaborn
+from matplotlib import pyplot
 
-from wqio.features import Location, Dataset
-
+from wqio.features import Dataset, Location
+from wqio.tests import helpers
 
 BASELINE_IMAGES = "_baseline_images/features_tests"
 TOLERANCE = helpers.get_img_tolerance()
@@ -699,19 +697,19 @@ def test_ds__plot_NDs_neither(ds_NDs, markerkwargs):
 def _do_jointplots(ds, hist=False, kde=False, rug=False):
     jg = ds.jointplot(hist=hist, kde=kde, rug=rug)
     assert isinstance(jg, seaborn.JointGrid)
-    return jg.fig
+    return jg.figure
 
 
 def test_ds_joint_hist_smoke(ds_NDs):
     with seaborn.axes_style("ticks"):
         fig1 = _do_jointplots(ds_NDs, hist=True)
-        return fig1
+    return fig1
 
 
 def test_ds_joint_kde_smoke(ds_NDs):
     with seaborn.axes_style("ticks"):
         fig2 = _do_jointplots(ds_NDs, kde=True)
-        return fig2
+    return fig2
 
 
 def test_ds_joint_rug_smoke(ds_NDs):
@@ -722,5 +720,5 @@ def test_ds_joint_rug_smoke(ds_NDs):
 
 def test_ds_joint_kde_rug_hist_smoke(ds_NDs):
     with seaborn.axes_style("ticks"):
-        fig4 = _do_jointplots(ds_NDs, hist=True, kde=True, rug=True)
-        return fig4
+        fig4 = _do_jointplots(ds_NDs, hist=True, kde=True)
+    return fig4
diff --git a/wqio/tests/test_hydro.py b/wqio/tests/test_hydro.py
@@ -2,13 +2,15 @@
 import pandas
 import pandas.testing as pdtest
 import pytest
+import seaborn
 from matplotlib import pyplot
 
 from wqio import hydro
 from wqio.tests import helpers
 
 BASELINE_IMAGES = "_baseline_images/hydro_tests"
 TOLERANCE = helpers.get_img_tolerance()
+FIVEMIN = pandas.offsets.Minute(5)
 
 
 class fakeStormSublcass(hydro.Storm):
@@ -19,7 +21,7 @@ def hr_simple():
     storm_file = helpers.test_data_path("teststorm_simple.csv")
     orig_record = (
         pandas.read_csv(storm_file, index_col="date", parse_dates=True)
-        .resample("5T")
+        .resample(FIVEMIN)
         .asfreq()
         .fillna(0)
     )
@@ -44,7 +46,7 @@ def hr_singular():
     storm_file = helpers.test_data_path("teststorm_singular.csv")
     orig_record = (
         pandas.read_csv(storm_file, index_col="date", parse_dates=True)
-        .resample("5T")
+        .resample(FIVEMIN)
         .asfreq()
         .fillna(0)
     )
@@ -62,7 +64,7 @@ def hr_first_obs():
     storm_file = helpers.test_data_path("teststorm_firstobs.csv")
     orig_record = (
         pandas.read_csv(storm_file, index_col="date", parse_dates=True)
-        .resample("5T")
+        .resample(FIVEMIN)
         .asfreq()
         .fillna(0)
     )
@@ -80,7 +82,7 @@ def hr_diff_storm_class():
     storm_file = helpers.test_data_path("teststorm_simple.csv")
     orig_record = (
         pandas.read_csv(storm_file, index_col="date", parse_dates=True)
-        .resample("5T")
+        .resample(FIVEMIN)
         .asfreq()
         .fillna(0)
     )
@@ -100,7 +102,7 @@ def setup_storms(filename, baseflow=None):
     storm_file = helpers.test_data_path(filename)
     orig_record = (
         pandas.read_csv(storm_file, index_col="date", parse_dates=True)
-        .resample("5T")
+        .resample(FIVEMIN)
         .asfreq()
         .fillna(0)
     )
@@ -127,7 +129,6 @@ def test_wet_first_row(wetcol, expected):
     df = pandas.DataFrame(
         {"A": [True, True, False], "B": [False, False, True], "Z": [0, 0, 0]}
     ).pipe(hydro._wet_first_row, wetcol, "Z")
-
     assert df.iloc[0].loc["Z"] == expected
 
 
@@ -187,7 +188,7 @@ def test_HydroRecord_histogram():
     stormfile = helpers.test_data_path("teststorm_simple.csv")
     orig_record = (
         pandas.read_csv(stormfile, index_col="date", parse_dates=True)
-        .resample("5T")
+        .resample(FIVEMIN)
         .asfreq()
         .fillna(0)
     )
@@ -201,8 +202,9 @@ def test_HydroRecord_histogram():
         intereventHours=3,
     )
 
-    fig = hr.histogram("Total Precip Depth", [4, 6, 8, 10])
-    return fig.fig
+    with seaborn.axes_style("ticks"):
+        fig = hr.histogram("Total Precip Depth", [4, 6, 8, 10])
+    return fig.figure
 
 
 def test_HydroRecord_attr(hr_simple_fixture):
@@ -585,7 +587,7 @@ def single_storm():
     storm_file = helpers.test_data_path("teststorm_simple.csv")
     orig_record = (
         pandas.read_csv(storm_file, index_col="date", parse_dates=True)
-        .resample("5T")
+        .resample(FIVEMIN)
         .asfreq()
         .fillna(0)
     )
@@ -609,7 +611,8 @@ def test_plot_storm_summary(single_storm):
         single_storm.inflowcol: "Effluent (l/s)",
         single_storm.precipcol: "Precip Depth (mm)",
     }
-    fig, artists, labels = single_storm.summaryPlot(outflow=False, serieslabels=labels)
+    with seaborn.axes_style("ticks"):
+        fig, _, labels = single_storm.summaryPlot(outflow=False, serieslabels=labels)
     return fig