Improve handling of DeprecationWarnings

Author: teutoburg

scopesim/__init__.py

@@ -14,17 +14,24 @@
 
 
 ###############################################################################
-#                            TURN OFF WARNINGS                                #
+#                         TURN OFF SOME WARNINGS                              #
 ###############################################################################
 
 import warnings
 import yaml
 from astropy.utils.exceptions import AstropyWarning
 
 warnings.simplefilter('ignore', UserWarning)
-warnings.simplefilter('ignore', FutureWarning)
 warnings.simplefilter('ignore', RuntimeWarning)  # warnings for the developer
-warnings.simplefilter('default', DeprecationWarning)  # allow in general
+
+try:
+    if __version__.is_prerelease or __version__.is_devrelease:
+        # Those are usually ignored, but in development we should see them.
+        warnings.simplefilter("default", DeprecationWarning)
+        warnings.simplefilter("default", PendingDeprecationWarning)
+except AttributeError:  # catch __version__ = "undetermined"
+    pass
+
 warnings.simplefilter('ignore', category=AstropyWarning)
 yaml.warnings({'YAMLLoadWarning': False})
 

scopesim/effects/data_container.py

@@ -85,7 +85,7 @@ def __init__(
 
         if filename is None and "file_name" in kwargs:
             warn("The 'file_name' kwarg is deprecated and will raise an error "
-                 "in the future, please use 'filename' instead!",
+                 "from version 0.12 onwards, please use 'filename' instead!",
                  DeprecationWarning, stacklevel=2)
             filename = kwargs["file_name"]
 

scopesim/effects/psfs/semianalytical.py

@@ -141,7 +141,7 @@ def remake_kernel(self, x):
              "will be removed in a future release. If you are using this "
              "method, pleas let us know by creating an issue at: "
              "https://github.com/AstarVienna/ScopeSim/issues",
-             DeprecationWarning, stacklevel=2)
+             FutureWarning, stacklevel=2)
         self._kernel = None
         return self.get_kernel(x)
 

scopesim/optics/image_plane.py

@@ -134,9 +134,9 @@ def add(self, hdus_or_tables, sub_pixel=None, spline_order=None,
         else:
             if isinstance(hdus_or_tables, Table):
                 warn("Adding a table directly to the ImagePlane is deprecated "
-                     "since v0.10.0. Passing a table "
-                     "to ImagePlane.add() will raise an error in the future. "
-                     "Use FOV to add tables and image HDUs together before.",
+                     "since v0.10.0. Passing a table to ImagePlane.add() will "
+                     "raise an error from version 0.12 onwards. Use FOV to "
+                     "add tables and image HDUs together before.",
                      DeprecationWarning, stacklevel=2)
                 self.hdu = add_table_to_imagehdu(hdus_or_tables, self.hdu,
                                                  sub_pixel, wcs_suffix)