From 437b895762c013c77bb87fea9c94b629b43fd307 2017-02-22 21:07:22 From: Thomas Kluyver Date: 2017-02-22 21:07:22 Subject: [PATCH] Merge pull request #10321 from Carreau/update-shims Update shim warnings to include IPython version. --- diff --git a/IPython/config.py b/IPython/config.py index c3a3e91..cf2baca 100644 --- a/IPython/config.py +++ b/IPython/config.py @@ -9,7 +9,7 @@ from warnings import warn from IPython.utils.shimmodule import ShimModule, ShimWarning -warn("The `IPython.config` package has been deprecated. " +warn("The `IPython.config` package has been deprecated since IPython 4.0. " "You should import from traitlets.config instead.", ShimWarning) diff --git a/IPython/frontend.py b/IPython/frontend.py index 49cf8b2..9cc3eaf 100644 --- a/IPython/frontend.py +++ b/IPython/frontend.py @@ -17,7 +17,7 @@ from warnings import warn from IPython.utils.shimmodule import ShimModule, ShimWarning -warn("The top-level `frontend` package has been deprecated. " +warn("The top-level `frontend` package has been deprecated since IPython 1.0. " "All its subpackages have been moved to the top `IPython` level.", ShimWarning) # Unconditionally insert the shim into sys.modules so that further import calls diff --git a/IPython/html.py b/IPython/html.py index 5a9a0ae..050be5c 100644 --- a/IPython/html.py +++ b/IPython/html.py @@ -9,7 +9,7 @@ from warnings import warn from IPython.utils.shimmodule import ShimModule, ShimWarning -warn("The `IPython.html` package has been deprecated. " +warn("The `IPython.html` package has been deprecated since IPython 4.0. " "You should import from `notebook` instead. " "`IPython.html.widgets` has moved to `ipywidgets`.", ShimWarning) diff --git a/IPython/kernel/__init__.py b/IPython/kernel/__init__.py index 2500a07..70a05ed 100644 --- a/IPython/kernel/__init__.py +++ b/IPython/kernel/__init__.py @@ -9,7 +9,7 @@ from warnings import warn from IPython.utils.shimmodule import ShimModule, ShimWarning -warn("The `IPython.kernel` package has been deprecated. " +warn("The `IPython.kernel` package has been deprecated since IPython 4.0." "You should import from ipykernel or jupyter_client instead.", ShimWarning) diff --git a/IPython/nbconvert.py b/IPython/nbconvert.py index 5e35324..2de4ee5 100644 --- a/IPython/nbconvert.py +++ b/IPython/nbconvert.py @@ -9,7 +9,7 @@ from warnings import warn from IPython.utils.shimmodule import ShimModule, ShimWarning -warn("The `IPython.nbconvert` package has been deprecated. " +warn("The `IPython.nbconvert` package has been deprecated since IPython 4.0. " "You should import from nbconvert instead.", ShimWarning) # Unconditionally insert the shim into sys.modules so that further import calls diff --git a/IPython/nbformat.py b/IPython/nbformat.py index c0a0704..310277d 100644 --- a/IPython/nbformat.py +++ b/IPython/nbformat.py @@ -9,7 +9,7 @@ from warnings import warn from IPython.utils.shimmodule import ShimModule, ShimWarning -warn("The `IPython.nbformat` package has been deprecated. " +warn("The `IPython.nbformat` package has been deprecated since IPython 4.0. " "You should import from nbformat instead.", ShimWarning) # Unconditionally insert the shim into sys.modules so that further import calls diff --git a/IPython/parallel.py b/IPython/parallel.py index fc0dd28..0f10012 100644 --- a/IPython/parallel.py +++ b/IPython/parallel.py @@ -9,7 +9,7 @@ from warnings import warn from IPython.utils.shimmodule import ShimModule, ShimWarning -warn("The `IPython.parallel` package has been deprecated. " +warn("The `IPython.parallel` package has been deprecated since IPython 4.0. " "You should import from ipyparallel instead.", ShimWarning) # Unconditionally insert the shim into sys.modules so that further import calls diff --git a/IPython/qt.py b/IPython/qt.py index aaada32..7557a3f 100644 --- a/IPython/qt.py +++ b/IPython/qt.py @@ -9,7 +9,7 @@ from warnings import warn from IPython.utils.shimmodule import ShimModule, ShimWarning -warn("The `IPython.qt` package has been deprecated. " +warn("The `IPython.qt` package has been deprecated since IPython 4.0. " "You should import from qtconsole instead.", ShimWarning) # Unconditionally insert the shim into sys.modules so that further import calls diff --git a/IPython/terminal/console.py b/IPython/terminal/console.py index c9a1700..65571a7 100644 --- a/IPython/terminal/console.py +++ b/IPython/terminal/console.py @@ -9,7 +9,7 @@ from warnings import warn from IPython.utils.shimmodule import ShimModule, ShimWarning -warn("The `IPython.terminal.console` package has been deprecated. " +warn("The `IPython.terminal.console` package has been deprecated since IPython 4.0. " "You should import from jupyter_console instead.", ShimWarning) # Unconditionally insert the shim into sys.modules so that further import calls