From f6328d7fb0f2211d521e1ee0ce0d204c8ef1eacc Mon Sep 17 00:00:00 2001 From: wemi3 <62965919+wemi3@users.noreply.github.com> Date: Tue, 26 Sep 2023 01:23:14 +0000 Subject: [PATCH 1/8] 26865 Removed deprecations from quiver.py --- lib/matplotlib/quiver.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/matplotlib/quiver.py b/lib/matplotlib/quiver.py index c8f8ba566106..5e6551f6df73 100644 --- a/lib/matplotlib/quiver.py +++ b/lib/matplotlib/quiver.py @@ -721,7 +721,6 @@ def _h_arrows(self, length): # Mask handling is deferred to the caller, _make_verts. return X, Y - quiver_doc = _api.deprecated("3.7")(property(lambda self: _quiver_doc)) _barbs_doc = r""" @@ -1178,4 +1177,3 @@ def set_offsets(self, xy): super().set_offsets(xy) self.stale = True - barbs_doc = _api.deprecated("3.7")(property(lambda self: _barbs_doc)) From 5888631391f94bbfafc5b7ae1156df03bf0842e5 Mon Sep 17 00:00:00 2001 From: wemi3 <62965919+wemi3@users.noreply.github.com> Date: Tue, 26 Sep 2023 01:38:33 +0000 Subject: [PATCH 2/8] Added rst file --- doc/api/next_api_changes/removals/26918-EW.rst | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 doc/api/next_api_changes/removals/26918-EW.rst diff --git a/doc/api/next_api_changes/removals/26918-EW.rst b/doc/api/next_api_changes/removals/26918-EW.rst new file mode 100644 index 000000000000..c787d26ba87f --- /dev/null +++ b/doc/api/next_api_changes/removals/26918-EW.rst @@ -0,0 +1,6 @@ +``quiver_doc`` +~~~~~~~~~~ +This attribute of ``Quiver``\s has been removed. +``barbs_doc`` +~~~~~~~~~~~~~~ +This attribute of ``Barbs``\s has been removed. \ No newline at end of file From 88f43cd7ca7d0cabcb0affb0869f2a9733582b90 Mon Sep 17 00:00:00 2001 From: wemi3 <62965919+wemi3@users.noreply.github.com> Date: Tue, 26 Sep 2023 01:53:03 +0000 Subject: [PATCH 3/8] updated quiver.pyi --- lib/matplotlib/quiver.pyi | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lib/matplotlib/quiver.pyi b/lib/matplotlib/quiver.pyi index c673c5dd3aff..2a043a92b4b5 100644 --- a/lib/matplotlib/quiver.pyi +++ b/lib/matplotlib/quiver.pyi @@ -125,8 +125,6 @@ class Quiver(mcollections.PolyCollection): def set_UVC( self, U: ArrayLike, V: ArrayLike, C: ArrayLike | None = ... ) -> None: ... - @property - def quiver_doc(self) -> str: ... class Barbs(mcollections.PolyCollection): sizes: dict[str, float] @@ -183,5 +181,3 @@ class Barbs(mcollections.PolyCollection): self, U: ArrayLike, V: ArrayLike, C: ArrayLike | None = ... ) -> None: ... def set_offsets(self, xy: ArrayLike) -> None: ... - @property - def barbs_doc(self) -> str: ... From 3c01cf4b7f46acb282fe77f9d10066d2c6a4876d Mon Sep 17 00:00:00 2001 From: wemi3 <62965919+wemi3@users.noreply.github.com> Date: Tue, 26 Sep 2023 01:58:23 +0000 Subject: [PATCH 4/8] removed extra lines --- lib/matplotlib/quiver.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/lib/matplotlib/quiver.py b/lib/matplotlib/quiver.py index 5e6551f6df73..76e2b4d79386 100644 --- a/lib/matplotlib/quiver.py +++ b/lib/matplotlib/quiver.py @@ -720,9 +720,6 @@ def _h_arrows(self, length): np.copyto(Y, Y1, where=tooshort) # Mask handling is deferred to the caller, _make_verts. return X, Y - - - _barbs_doc = r""" Plot a 2D field of barbs. @@ -1175,5 +1172,4 @@ def set_offsets(self, xy): _check_consistent_shapes(x, y, u, v) xy = np.column_stack((x, y)) super().set_offsets(xy) - self.stale = True - + self.stale = True \ No newline at end of file From 4cd54e2b754a4545c943f4dc7f4bff67f44d6008 Mon Sep 17 00:00:00 2001 From: wemi3 <62965919+wemi3@users.noreply.github.com> Date: Tue, 26 Sep 2023 02:10:55 +0000 Subject: [PATCH 5/8] removed code stubs, edited rst file --- doc/api/next_api_changes/removals/26918-EW.rst | 9 +++------ lib/matplotlib/quiver.py | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/doc/api/next_api_changes/removals/26918-EW.rst b/doc/api/next_api_changes/removals/26918-EW.rst index c787d26ba87f..2363b8897dfb 100644 --- a/doc/api/next_api_changes/removals/26918-EW.rst +++ b/doc/api/next_api_changes/removals/26918-EW.rst @@ -1,6 +1,3 @@ -``quiver_doc`` -~~~~~~~~~~ -This attribute of ``Quiver``\s has been removed. -``barbs_doc`` -~~~~~~~~~~~~~~ -This attribute of ``Barbs``\s has been removed. \ No newline at end of file +``Quiver.quiver_doc and Barbs.barbs_doc`` +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +... are deprecated. These are the doc-string and should not be accessible as a named class member. diff --git a/lib/matplotlib/quiver.py b/lib/matplotlib/quiver.py index 76e2b4d79386..f972e287b796 100644 --- a/lib/matplotlib/quiver.py +++ b/lib/matplotlib/quiver.py @@ -1172,4 +1172,4 @@ def set_offsets(self, xy): _check_consistent_shapes(x, y, u, v) xy = np.column_stack((x, y)) super().set_offsets(xy) - self.stale = True \ No newline at end of file + self.stale = True From 588858f490e745e2ea7b01be6eed030b4f300b40 Mon Sep 17 00:00:00 2001 From: wemi3 <62965919+wemi3@users.noreply.github.com> Date: Tue, 26 Sep 2023 20:57:21 -0700 Subject: [PATCH 6/8] Update lib/matplotlib/quiver.py Co-authored-by: Elliott Sales de Andrade --- lib/matplotlib/quiver.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/matplotlib/quiver.py b/lib/matplotlib/quiver.py index f972e287b796..52f56deb40c0 100644 --- a/lib/matplotlib/quiver.py +++ b/lib/matplotlib/quiver.py @@ -720,6 +720,8 @@ def _h_arrows(self, length): np.copyto(Y, Y1, where=tooshort) # Mask handling is deferred to the caller, _make_verts. return X, Y + + _barbs_doc = r""" Plot a 2D field of barbs. From 1724779ab59ac588cfa18e4ca395ff7f4a15597b Mon Sep 17 00:00:00 2001 From: wemi3 <62965919+wemi3@users.noreply.github.com> Date: Tue, 26 Sep 2023 20:57:30 -0700 Subject: [PATCH 7/8] Update doc/api/next_api_changes/removals/26918-EW.rst Co-authored-by: Oscar Gustafsson --- doc/api/next_api_changes/removals/26918-EW.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/api/next_api_changes/removals/26918-EW.rst b/doc/api/next_api_changes/removals/26918-EW.rst index 2363b8897dfb..e949024caaeb 100644 --- a/doc/api/next_api_changes/removals/26918-EW.rst +++ b/doc/api/next_api_changes/removals/26918-EW.rst @@ -1,3 +1,3 @@ ``Quiver.quiver_doc and Barbs.barbs_doc`` ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -... are deprecated. These are the doc-string and should not be accessible as a named class member. +... are removed. These are the doc-string and should not be accessible as a named class member. From 5fb8b5604382c6a42a95570e5edd8245411173c3 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Wed, 27 Sep 2023 03:36:12 -0400 Subject: [PATCH 8/8] Fix typo --- doc/api/next_api_changes/removals/26918-EW.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/api/next_api_changes/removals/26918-EW.rst b/doc/api/next_api_changes/removals/26918-EW.rst index e949024caaeb..454f35d5e200 100644 --- a/doc/api/next_api_changes/removals/26918-EW.rst +++ b/doc/api/next_api_changes/removals/26918-EW.rst @@ -1,3 +1,3 @@ -``Quiver.quiver_doc and Barbs.barbs_doc`` -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +``Quiver.quiver_doc`` and ``Barbs.barbs_doc`` +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ... are removed. These are the doc-string and should not be accessible as a named class member.