From 446ae8266af873bf922fe53f8ba48ee1d56f9f12 Mon Sep 17 00:00:00 2001
From: Kyle Conroy <kyleconroy@gmail.com>
Date: Thu, 9 Jan 2025 12:46:13 -0500
Subject: [PATCH] orientation: remove deprecated link_type, wcs_use_affine

---
 CHANGES.rst                                   |  2 ++
 .../imviz/plugins/orientation/orientation.py  | 22 +------------------
 jdaviz/configs/imviz/tests/test_helper.py     |  2 --
 3 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index edc73564c7..81d8f8b55a 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -42,6 +42,8 @@ Cubeviz
 Imviz
 ^^^^^
 
+- orientation plugin: ``link_type`` and ``wcs_use_affine`` (previously deprecated) have now been removed. [#3385]
+
 Mosviz
 ^^^^^^
 
diff --git a/jdaviz/configs/imviz/plugins/orientation/orientation.py b/jdaviz/configs/imviz/plugins/orientation/orientation.py
index 61547b24dc..60ec8f41b9 100644
--- a/jdaviz/configs/imviz/plugins/orientation/orientation.py
+++ b/jdaviz/configs/imviz/plugins/orientation/orientation.py
@@ -152,33 +152,13 @@ def user_api(self):
         return PluginUserApi(
             self,
             expose=(
-                'align_by', 'link_type', 'wcs_fast_approximation', 'wcs_use_affine',
+                'align_by', 'wcs_fast_approximation',
                 'delete_subsets', 'viewer', 'orientation',
                 'rotation_angle', 'east_left', 'add_orientation',
                 'set_north_up_east_left', 'set_north_up_east_right',
             )
         )
 
-    @property
-    @deprecated(since="4.0", alternative="align_by")
-    def link_type(self):
-        return self.align_by
-
-    @link_type.setter
-    @deprecated(since="4.0", alternative="align_by")
-    def link_type(self, link_type):
-        self.align_by = link_type
-
-    @property
-    @deprecated(since="4.0", alternative="wcs_fast_approximation")
-    def wcs_use_affine(self):
-        return self.wcs_fast_approximation
-
-    @wcs_use_affine.setter
-    @deprecated(since="4.0", alternative="wcs_fast_approximation")
-    def wcs_use_affine(self, wcs_use_affine):
-        self.wcs_fast_approximation = wcs_use_affine
-
     def _link_image_data(self):
         self.linking_in_progress = True
         try:
diff --git a/jdaviz/configs/imviz/tests/test_helper.py b/jdaviz/configs/imviz/tests/test_helper.py
index dd5add87da..795ea780ee 100644
--- a/jdaviz/configs/imviz/tests/test_helper.py
+++ b/jdaviz/configs/imviz/tests/test_helper.py
@@ -2,8 +2,6 @@
 import pytest
 
 
-@pytest.mark.filterwarnings(r"ignore:The link_type function is deprecated")
-@pytest.mark.filterwarnings(r"ignore:The wcs_use_affine function is deprecated")
 def test_plugin_user_apis(imviz_helper):
     for plugin_name, plugin_api in imviz_helper.plugins.items():
         plugin = plugin_api._obj