From 35f9e3ed673ae1a28025bcb7a12f7db1c85db7cc Mon Sep 17 00:00:00 2001 From: Devin Stein Date: Wed, 27 Apr 2022 15:06:24 -0700 Subject: [PATCH 1/2] Remove reference to deprecate methods These methods have been deprecated since Ipython5 https://github.com/ipython/ipython/commit/967e96ec53b7e50ac3253fa7e26af328978b073a --- hdijupyterutils/hdijupyterutils/ipythondisplay.py | 6 +++--- hdijupyterutils/setup.py | 2 +- sparkmagic/setup.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hdijupyterutils/hdijupyterutils/ipythondisplay.py b/hdijupyterutils/hdijupyterutils/ipythondisplay.py index 646ff5b53..f19862e8f 100644 --- a/hdijupyterutils/hdijupyterutils/ipythondisplay.py +++ b/hdijupyterutils/hdijupyterutils/ipythondisplay.py @@ -20,12 +20,12 @@ def stdout_flush(self): sys.stdout.flush() def write(self, msg): - self._ipython_shell.write(msg) + sys.stdout.write(msg) self.stdout_flush() def writeln(self, msg): - self.write(u"{}\n".format(msg)) + self.write("{}\n".format(msg)) def send_error(self, error): - self._ipython_shell.write_err(u"{}\n".format(error)) + sys.stderr.write("{}\n".format(error)) self.stderr_flush() diff --git a/hdijupyterutils/setup.py b/hdijupyterutils/setup.py index d2c93d050..51d1b30d3 100644 --- a/hdijupyterutils/setup.py +++ b/hdijupyterutils/setup.py @@ -56,7 +56,7 @@ def version(path): "Programming Language :: Python :: 3.7", ], install_requires=[ - "ipython>=4.0.2,<8", + "ipython>=5", "nose", "mock", "ipywidgets>5.0.0", diff --git a/sparkmagic/setup.py b/sparkmagic/setup.py index 872b81da6..cef28b86f 100644 --- a/sparkmagic/setup.py +++ b/sparkmagic/setup.py @@ -82,7 +82,7 @@ def version(path): install_requires=[ "hdijupyterutils>=0.6", "autovizwidget>=0.6", - "ipython>=4.0.2", + "ipython>=5", "nose", "mock", "pandas>=0.17.1", From bcff00bb733a145ba901a2c1e2461b9dabb21f92 Mon Sep 17 00:00:00 2001 From: Devin Stein Date: Wed, 27 Apr 2022 15:11:28 -0700 Subject: [PATCH 2/2] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5aff1038b..d51ace3e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ ### Bug Fixes * Fixed, simplified, and sped up the sparkmagic Docker images for local development and testing +* Adds support for `ipython>=8` ## 0.19.2