Merge pull request ipython#9146 from Carreau/warnings

minrk · minrk · commit fafb8da48113 · 2016-01-20T12:58:48.000+01:00
Add filter warnings for Traitlets 4.1 now that it's out.
diff --git a/IPython/testing/iptest.py b/IPython/testing/iptest.py
@@ -51,8 +51,9 @@
     # ignore some warnings from traitlets until 6.0
     warnings.filterwarnings('ignore', message='.*on_trait_change is deprecated: use observe instead.*')
     warnings.filterwarnings('ignore', message='.*was set from the constructor.*', category=Warning, module='IPython.*')
+    warnings.filterwarnings('ignore', message='.*use the instance .help string directly, like x.help.*', category=DeprecationWarning, module='IPython.*')
 else :
-    warnings.warn('iptest has been filtering out for Traitlets warnings messages, for 2 major versions (since 4.x), please consider updating to use new API')
+    warnings.warn('iptest has been filtering out for Traitlets warnings messages, for 2 minor versions (since 4.x), please consider updating to use new API')
 
 if version_info < (6,):
     # nose.tools renames all things from `camelCase` to `snake_case` which raise an
