Fix pandas 1.0.5 tests

Author: znicholls

tests/integration/test_plotting_integration.py

@@ -37,19 +37,17 @@ def test_plumeplot_pre_calculated(plumeplot_scmrun, quantiles_plumes):
 
 
 def test_plumeplot_warns_dashes_without_lines(scm_run):
-    with pytest.warns(UserWarning) as record:
+    warn_msg = re.escape(
+        "`dashes` was passed but no lines were plotted, the style "
+        "settings will not be used"
+    )
+    with pytest.warns(UserWarning, match=warn_msg):
         scm_run.plumeplot(
             quantiles_plumes=(((0.17, 0.83), 0.7),),
             quantile_over="ensemble_member",
             dashes={"Surface Air Temperature Change": "--"},
         )
 
-    assert len(record) == 1
-    assert record[0].message.args[0] == (
-        "`dashes` was passed but no lines were plotted, the style "
-        "settings will not be used"
-    )
-
 
 def test_plumeplot_non_unique_lines(plumeplot_scmrun):
     quantile_over = "climate_model"

tests/unit/test_run.py

@@ -1508,11 +1508,9 @@ def test_append(scm_run):
 
 def test_append_exact_duplicates(scm_run):
     other = copy.deepcopy(scm_run)
-    with warnings.catch_warnings(record=True) as mock_warn_taking_average:
+    with pytest.warns(UserWarning):
         scm_run.append(other, duplicate_msg="warn").timeseries()
 
-    assert len(mock_warn_taking_average) == 1  # test message elsewhere
-
     assert_scmdf_almost_equal(scm_run, other, check_ts_names=False)
 
 
@@ -1543,6 +1541,7 @@ def test_append_duplicates_order_doesnt_matter(scm_run):
     npt.assert_almost_equal(obs, exp)
 
 
+@pytest.mark.filterwarnings("ignore::DeprecationWarning")
 @pytest.mark.parametrize("duplicate_msg", ("warn", True, False))
 def test_append_duplicate_times(test_append_scm_runs, duplicate_msg):
     base = test_append_scm_runs["base"]
@@ -1573,6 +1572,7 @@ def test_append_duplicate_times(test_append_scm_runs, duplicate_msg):
     )
 
 
+@pytest.mark.filterwarnings("ignore::DeprecationWarning")
 def test_append_doesnt_warn_if_continuous_times(test_append_scm_runs):
     join_year = 2011
     base = test_append_scm_runs["base"].filter(year=range(1, join_year))
@@ -1584,6 +1584,7 @@ def test_append_doesnt_warn_if_continuous_times(test_append_scm_runs):
     assert len(mock_warn_taking_average) == 0
 
 
+@pytest.mark.filterwarnings("ignore::DeprecationWarning")
 def test_append_doesnt_warn_if_different(test_append_scm_runs):
     base = test_append_scm_runs["base"].filter(scenario="a_scenario")
     other = test_append_scm_runs["base"].filter(scenario="a_scenario2")
@@ -1602,17 +1603,16 @@ def test_append_duplicate_times_error_msg(scm_run):
         scm_run.append(other, duplicate_msg="junk")
 
 
+@pytest.mark.filterwarnings("ignore::DeprecationWarning")
 def test_append_inplace(scm_run):
     other = scm_run * 2
 
     obs = scm_run.filter(scenario="a_scenario2").timeseries().squeeze()
     exp = [2, 7, 7]
     npt.assert_almost_equal(obs, exp)
-    with warnings.catch_warnings(record=True) as mock_warn_taking_average:
+    with pytest.warns(UserWarning):  # test message elsewhere
         scm_run.append(other, inplace=True, duplicate_msg="warn")
 
-    assert len(mock_warn_taking_average) == 1  # test message elsewhere
-
     obs = scm_run.filter(scenario="a_scenario2").timeseries().squeeze()
     exp = [(2.0 + 4.0) / 2, (7.0 + 14.0) / 2, (7.0 + 14.0) / 2]
     npt.assert_almost_equal(obs, exp)