From f579544cf50fa130ce3c480e0e9818873fd02ff7 Mon Sep 17 00:00:00 2001 From: Jody Klymak Date: Sun, 3 Dec 2023 08:59:17 -0800 Subject: [PATCH 1/3] MNT: remove xcorr and acorr from test_datetime --- lib/matplotlib/tests/test_datetime.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/matplotlib/tests/test_datetime.py b/lib/matplotlib/tests/test_datetime.py index fc1c5f5fbd98..94a3947b5a4f 100644 --- a/lib/matplotlib/tests/test_datetime.py +++ b/lib/matplotlib/tests/test_datetime.py @@ -8,12 +8,16 @@ class TestDatetimePlotting: +<<<<<<< HEAD @pytest.mark.xfail(reason="Test for acorr not written yet") @mpl.style.context("default") def test_acorr(self): fig, ax = plt.subplots() ax.acorr(...) +======= + @pytest.mark.xfail(reason="Test for annotate not written yet") +>>>>>>> 151199a8ef (MNT: remove xcorr and acorr from test_datetime) @mpl.style.context("default") def test_annotate(self): mpl.rcParams["date.converter"] = 'concise' @@ -738,9 +742,3 @@ def test_violinplot(self): def test_vlines(self): fig, ax = plt.subplots() ax.vlines(...) - - @pytest.mark.xfail(reason="Test for xcorr not written yet") - @mpl.style.context("default") - def test_xcorr(self): - fig, ax = plt.subplots() - ax.xcorr(...) From 403873f6665dea73251c15198fb1df8e28ca8aad Mon Sep 17 00:00:00 2001 From: Jody Klymak Date: Tue, 5 Dec 2023 16:53:04 -0800 Subject: [PATCH 2/3] DOC: note lack of unit handling in docstring [ci doc] --- lib/matplotlib/axes/_axes.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py index 6a9353f45146..358b12ca563d 100644 --- a/lib/matplotlib/axes/_axes.py +++ b/lib/matplotlib/axes/_axes.py @@ -1979,6 +1979,8 @@ def acorr(self, x, **kwargs): Parameters ---------- x : array-like + Not run through Matplotlib's unit conversion, so this should + be a unit-less array. detrend : callable, default: `.mlab.detrend_none` (no detrending) A detrending function applied to *x*. It must have the @@ -2056,6 +2058,8 @@ def xcorr(self, x, y, normed=True, detrend=mlab.detrend_none, Parameters ---------- x, y : array-like of length n + Neither *x* nor *y* are run through Matplotlib's unit conversion, so + these should be unit-less arrays. detrend : callable, default: `.mlab.detrend_none` (no detrending) A detrending function applied to *x* and *y*. It must have the From 7cfd68888e08358a698e284d79d76734066d5c08 Mon Sep 17 00:00:00 2001 From: Jody Klymak Date: Tue, 5 Dec 2023 21:59:31 -0800 Subject: [PATCH 3/3] DOC: note lack of unit handling in docstring [ci doc] --- lib/matplotlib/tests/test_datetime.py | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/lib/matplotlib/tests/test_datetime.py b/lib/matplotlib/tests/test_datetime.py index 94a3947b5a4f..244ee2af2a58 100644 --- a/lib/matplotlib/tests/test_datetime.py +++ b/lib/matplotlib/tests/test_datetime.py @@ -8,16 +8,6 @@ class TestDatetimePlotting: -<<<<<<< HEAD - @pytest.mark.xfail(reason="Test for acorr not written yet") - @mpl.style.context("default") - def test_acorr(self): - fig, ax = plt.subplots() - ax.acorr(...) - -======= - @pytest.mark.xfail(reason="Test for annotate not written yet") ->>>>>>> 151199a8ef (MNT: remove xcorr and acorr from test_datetime) @mpl.style.context("default") def test_annotate(self): mpl.rcParams["date.converter"] = 'concise'