Skip to content

Commit

Permalink
[pre-commit.ci] auto fixes from pre-commit.com hooks
Browse files Browse the repository at this point in the history
for more information, see https://pre-commit.ci
  • Loading branch information
pre-commit-ci[bot] committed Jul 13, 2023
1 parent aa5357a commit 66566c8
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
3 changes: 1 addition & 2 deletions ipykernel/kernelapp.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

import atexit
import errno
import json
import logging
import os
import signal
Expand All @@ -25,7 +24,7 @@
)
from IPython.core.profiledir import ProfileDir
from IPython.core.shellapp import InteractiveShellApp, shell_aliases, shell_flags
from jupyter_client import write_connection_file, get_connection_info
from jupyter_client import get_connection_info, write_connection_file
from jupyter_client.connect import ConnectionFileMixin
from jupyter_client.session import Session, session_aliases, session_flags
from jupyter_core.paths import jupyter_runtime_dir
Expand Down
6 changes: 3 additions & 3 deletions ipykernel/tests/test_kernelapp.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@
from unittest.mock import patch

import pytest
from jupyter_core.paths import secure_write

from ipykernel import connect
from ipykernel.kernelapp import IPKernelApp
from jupyter_core.paths import secure_write

from .conftest import MockKernel

Expand Down Expand Up @@ -64,7 +63,7 @@ def test_merge_connection_file():
"control_port": 5,
"key": "abc123",
"signature_scheme": "hmac-sha256",
"kernel_name": "My Kernel"
"kernel_name": "My Kernel",
}
# We cannot use connect.write_connection_file since
# it replaces port number 0 with a random port
Expand Down Expand Up @@ -102,6 +101,7 @@ def test_merge_connection_file():
app.cleanup_connection_file()
app.close()


@pytest.mark.skipif(trio is None, reason="requires trio")
def test_trio_loop():
app = IPKernelApp(trio_loop=True)
Expand Down

0 comments on commit 66566c8

Please sign in to comment.