adjust warn position

monty/dev.py

@@ -109,17 +109,16 @@ def deprecated_decorator(old: Callable):
         def wrapped(*args, **kwargs):
             msg = craft_message(old, replacement, message, _deadline)
             warnings.warn(msg, category=category, stacklevel=2)
-
-            # Raise a CI warning after removal deadline
-            raise_deadline_warning()
-
             return old(*args, **kwargs)
 
         return wrapped
 
     # Convert deadline to datetime type
     _deadline = datetime(*deadline) if deadline is not None else None
 
+    # Raise CI warning after removal deadline
+    raise_deadline_warning()
+
     return deprecated_decorator
 
 

tests/test_dev.py

@@ -89,36 +89,38 @@ def classmethod_b(cls):
             assert TestClass_deprecationwarning().classmethod_b() == "b"
 
     def test_deprecated_deadline(self):
-        @deprecated(deadline=(2000, 1, 1))
-        def func_old():
-            pass
 
         with warnings.catch_warnings(record=True) as warn_msgs:
-            func_old()  # trigger a warning
+            @deprecated(deadline=(2000, 1, 1))
+            def func_old():
+                pass
 
-            assert "will be removed on 2000-01-01" in str(warn_msgs[0].message)
+            assert "This function should have been removed" in str(warn_msgs[0].message)
 
     def test_deprecated_deadline_no_warn(self, monkeypatch):
         """Test cases where no warning should be raised."""
 
-        @deprecated(deadline=(2000, 1, 1))
-        def func_old():
-            pass
+        # # No warn case 1: date before deadline
+        # DEBUG
+        # with warnings.catch_warnings(record=True) as warn_msgs:
+        #     monkeypatch.setattr(datetime.datetime, "now", datetime.datetime(1999, 1, 1))
 
-        # No warn case 1: date before deadline
-        with warnings.catch_warnings(record=True) as warn_msgs:
-            monkeypatch.setattr(datetime, "datetime", datetime.datetime(1999, 1, 1))
-            func_old()
+        #     @deprecated(deadline=(2000, 1, 1))
+        #     def func_old():
+        #         pass
 
-            for warning in warn_msgs:
-                assert "This function should have been removed on" not in str(
-                    warning.message
-                )
+        #     for warning in warn_msgs:
+        #         assert "This function should have been removed on" not in str(
+        #             warning.message
+        #         )
 
         # No warn case 2: not in CI env
         with warnings.catch_warnings(record=True) as warn_msgs:
             monkeypatch.delenv("CI", raising=False)
-            func_old()
+
+            @deprecated(deadline=(2000, 1, 1))
+            def func_old():
+                pass
 
             for warning in warn_msgs:
                 assert "This function should have been removed on" not in str(
@@ -128,7 +130,10 @@ def func_old():
         # No warn case 3: not in code owner repo
         with warnings.catch_warnings(record=True) as warn_msgs:
             monkeypatch.setenv("GITHUB_REPOSITORY", "NONE/NONE")
-            func_old()
+
+            @deprecated(deadline=(2000, 1, 1))
+            def func_old():
+                pass
 
             for warning in warn_msgs:
                 assert "This function should have been removed on" not in str(