Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove ipykernel.codeutil deprecated since IPykernel 4.3.1 (Feb 2016) #687

Merged
merged 1 commit into from
Jun 14, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 0 additions & 38 deletions ipykernel/codeutil.py

This file was deleted.

7 changes: 1 addition & 6 deletions ipykernel/pickleutil.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,7 @@
from ipython_genutils.py3compat import buffer_to_bytes

# This registers a hook when it's imported
try:
# available since ipyparallel 5.1.1
from ipyparallel.serialize import codeutil
except ImportError:
# Deprecated since ipykernel 4.3.1
from ipykernel import codeutil
from ipyparallel.serialize import codeutil

from traitlets.log import get_logger

Expand Down
4 changes: 2 additions & 2 deletions ipykernel/tests/test_serialize.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
import pickle
from collections import namedtuple

from ipykernel.serialize import serialize_object, deserialize_object
from ipyparallel.serialize import serialize_object, deserialize_object
from IPython.testing import decorators as dec
from ipykernel.pickleutil import CannedArray, CannedClass, interactive
from ipyparallel.serialize.canning import CannedArray, CannedClass, interactive


def roundtrip(obj):
Expand Down
13 changes: 7 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,13 @@ def run(self):
'appnope;platform_system=="Darwin"',
],
extras_require={
'test': [
'pytest !=5.3.4',
'pytest-cov',
'flaky',
'nose', # nose because there are still a few nose.tools imports hanging around
'jedi<=0.17.2'
"test": [
"pytest !=5.3.4",
"pytest-cov",
"flaky",
"nose", # nose because there are still a few nose.tools imports hanging around
"jedi<=0.17.2",
"ipyparallel",
],
},
classifiers=[
Expand Down