FIX stop forcing deprecation warnings for external packages

zaxtax · Nov 28, 2013 · 9e1edd1 · 9e1edd1
1 parent 80b96bc
commit 9e1edd1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/sklearn/__init__.py b/sklearn/__init__.py
@@ -13,8 +13,14 @@
 See http://scikit-learn.org for complete documentation.
 """
 import sys
+import re
+import warnings
 __version__ = '0.15-git'
 
+# Make sure that DeprecationWarning within this package always gets printed
+warnings.filterwarnings('always', category=DeprecationWarning,
+                        module='^{}\.'.format(re.escape(__name__)))
+
 try:
     # This variable is injected in the __builtins__ by the build
     # process. It used to enable importing subpackages of sklearn when

diff --git a/sklearn/utils/__init__.py b/sklearn/utils/__init__.py
@@ -23,10 +23,6 @@
            "compute_class_weight", "minimum_spanning_tree", "column_or_1d"]
 
 
-# Make sure that DeprecationWarning get printed
-warnings.simplefilter("always", DeprecationWarning)
-
-
 class deprecated(object):
     """Decorator to mark a function or class as deprecated.