Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ipython/ipykernel
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v6.20.0
Choose a base ref
...
head repository: ipython/ipykernel
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v6.20.1
Choose a head ref
  • 6 commits
  • 30 files changed
  • 4 contributors

Commits on Jan 3, 2023

  1. [pre-commit.ci] pre-commit autoupdate (#1068)

    updates:
    - [github.com/psf/black: 22.10.0 → 22.12.0](psf/black@22.10.0...22.12.0)
    - [github.com/charliermarsh/ruff-pre-commit: v0.0.189 → v0.0.207](astral-sh/ruff-pre-commit@v0.0.189...v0.0.207)
    
    Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
    pre-commit-ci[bot] authored Jan 3, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    e3c74d0 View commit details
  2. Fix types and sync lint deps (#1070)

    fix types and sync lint deps
    blink1073 authored Jan 3, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    817258d View commit details

Commits on Jan 8, 2023

  1. Update CI (#1073)

    update ci
    blink1073 authored Jan 8, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    4f0e252 View commit details

Commits on Jan 9, 2023

  1. Don't raise error when trying to create another Qt app for Qt eventlo…

    …op (#1071)
    
    * Don't raise error when trying to set another app for Qt eventloop
    
    - This was making the `%matplotlib qt` fail in Spyder.
    - It was also generating a long traceback when trying to set another
    interactive backend (e.g. tk).
    
    * Remove support to set a Qt4 eventloop because it's no longer supported
    
    * Move big comment outside a function to be part of a docstring
    
    * Don't raise errors in set_qt_api_env_from_gui
    
    Use prints instead because these errors are not displayed to users but
    contain valuable information for them.
    
    * Restore loop_qt5 function because it was public API
    
    * [pre-commit.ci] auto fixes from pre-commit.com hooks
    
    for more information, see https://pre-commit.ci
    
    * Add missing return's in set_qt_api_env_from_gui
    
    This avoids making that function run beyond the point where a certain
    message is printed.
    
    * Fix test_qt_enable_gui with the new changes
    
    Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
    ccordoba12 and pre-commit-ci[bot] authored Jan 9, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    a192ced View commit details
  2. Add api docs (#1067)

    add api docs
    blink1073 authored Jan 9, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    5f07abc View commit details
  3. Publish 6.20.1

    SHA256 hashes:
    
    ipykernel-6.20.1-py3-none-any.whl: a314e6782a4f9e277783382976b3a93608a3787cd70a235b558b47f875134be1
    
    ipykernel-6.20.1.tar.gz: f6016ecbf581d0ea6e29ba16cee6cc1a9bbde3835900c46c6571a791692f4139
    blink1073 committed Jan 9, 2023

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    b4ea598 View commit details
9 changes: 9 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -93,6 +93,15 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
- name: Build API docs
run: |
hatch run docs:api
# If this fails run `hatch run docs:api` locally
# and commit.
git status --porcelain
git status -s | grep "A" && exit 1
git status -s | grep "M" && exit 1
echo "API docs done"
- run: hatch run docs:build

test_without_debugpy:
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -31,12 +31,12 @@ repos:
- id: mdformat

- repo: https://github.com/psf/black
rev: 22.10.0
rev: 22.12.0
hooks:
- id: black

- repo: https://github.com/charliermarsh/ruff-pre-commit
rev: v0.0.189
rev: v0.0.215
hooks:
- id: ruff
args: ["--fix"]
27 changes: 25 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -2,6 +2,31 @@

<!-- <START NEW CHANGELOG ENTRY> -->

## 6.20.1

([Full Changelog](https://github.com/ipython/ipykernel/compare/v6.20.0...5f07abc22a1c75672f7bee129505f19c954a7c36))

### Bugs fixed

- Don't raise error when trying to create another Qt app for Qt eventloop [#1071](https://github.com/ipython/ipykernel/pull/1071) ([@ccordoba12](https://github.com/ccordoba12))

### Maintenance and upkeep improvements

- Update CI [#1073](https://github.com/ipython/ipykernel/pull/1073) ([@blink1073](https://github.com/blink1073))
- Fix types and sync lint deps [#1070](https://github.com/ipython/ipykernel/pull/1070) ([@blink1073](https://github.com/blink1073))

### Documentation improvements

- Add api docs [#1067](https://github.com/ipython/ipykernel/pull/1067) ([@blink1073](https://github.com/blink1073))

### Contributors to this release

([GitHub contributors page for this release](https://github.com/ipython/ipykernel/graphs/contributors?from=2022-12-26&to=2023-01-09&type=c))

[@blink1073](https://github.com/search?q=repo%3Aipython%2Fipykernel+involves%3Ablink1073+updated%3A2022-12-26..2023-01-09&type=Issues) | [@ccordoba12](https://github.com/search?q=repo%3Aipython%2Fipykernel+involves%3Accordoba12+updated%3A2022-12-26..2023-01-09&type=Issues) | [@pre-commit-ci](https://github.com/search?q=repo%3Aipython%2Fipykernel+involves%3Apre-commit-ci+updated%3A2022-12-26..2023-01-09&type=Issues)

<!-- <END NEW CHANGELOG ENTRY> -->

## 6.20.0

([Full Changelog](https://github.com/ipython/ipykernel/compare/v6.19.4...fbea757e117c1d3b0da29a40b4abcf3133a310f4))
@@ -20,8 +45,6 @@

[@blink1073](https://github.com/search?q=repo%3Aipython%2Fipykernel+involves%3Ablink1073+updated%3A2022-12-20..2022-12-26&type=Issues) | [@shaperilio](https://github.com/search?q=repo%3Aipython%2Fipykernel+involves%3Ashaperilio+updated%3A2022-12-20..2022-12-26&type=Issues)

<!-- <END NEW CHANGELOG ENTRY> -->

## 6.19.4

([Full Changelog](https://github.com/ipython/ipykernel/compare/v6.19.3...07da48e686b5906525c2a6b8cfc11cd7c3d96a5f))
25 changes: 25 additions & 0 deletions docs/api/ipykernel.comm.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
ipykernel.comm package
======================

Submodules
----------


.. automodule:: ipykernel.comm.comm
:members:
:undoc-members:
:show-inheritance:


.. automodule:: ipykernel.comm.manager
:members:
:undoc-members:
:show-inheritance:

Module contents
---------------

.. automodule:: ipykernel.comm
:members:
:undoc-members:
:show-inheritance:
55 changes: 55 additions & 0 deletions docs/api/ipykernel.inprocess.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
ipykernel.inprocess package
===========================

Submodules
----------


.. automodule:: ipykernel.inprocess.blocking
:members:
:undoc-members:
:show-inheritance:


.. automodule:: ipykernel.inprocess.channels
:members:
:undoc-members:
:show-inheritance:


.. automodule:: ipykernel.inprocess.client
:members:
:undoc-members:
:show-inheritance:


.. automodule:: ipykernel.inprocess.constants
:members:
:undoc-members:
:show-inheritance:


.. automodule:: ipykernel.inprocess.ipkernel
:members:
:undoc-members:
:show-inheritance:


.. automodule:: ipykernel.inprocess.manager
:members:
:undoc-members:
:show-inheritance:


.. automodule:: ipykernel.inprocess.socket
:members:
:undoc-members:
:show-inheritance:

Module contents
---------------

.. automodule:: ipykernel.inprocess
:members:
:undoc-members:
:show-inheritance:
130 changes: 130 additions & 0 deletions docs/api/ipykernel.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
ipykernel package
=================

Subpackages
-----------

.. toctree::
:maxdepth: 4

ipykernel.comm
ipykernel.inprocess

Submodules
----------


.. automodule:: ipykernel.compiler
:members:
:undoc-members:
:show-inheritance:


.. automodule:: ipykernel.connect
:members:
:undoc-members:
:show-inheritance:


.. automodule:: ipykernel.control
:members:
:undoc-members:
:show-inheritance:


.. automodule:: ipykernel.debugger
:members:
:undoc-members:
:show-inheritance:


.. automodule:: ipykernel.displayhook
:members:
:undoc-members:
:show-inheritance:


.. automodule:: ipykernel.embed
:members:
:undoc-members:
:show-inheritance:


.. automodule:: ipykernel.eventloops
:members:
:undoc-members:
:show-inheritance:


.. automodule:: ipykernel.heartbeat
:members:
:undoc-members:
:show-inheritance:


.. automodule:: ipykernel.iostream
:members:
:undoc-members:
:show-inheritance:


.. automodule:: ipykernel.ipkernel
:members:
:undoc-members:
:show-inheritance:


.. automodule:: ipykernel.jsonutil
:members:
:undoc-members:
:show-inheritance:


.. automodule:: ipykernel.kernelapp
:members:
:undoc-members:
:show-inheritance:


.. automodule:: ipykernel.kernelbase
:members:
:undoc-members:
:show-inheritance:


.. automodule:: ipykernel.kernelspec
:members:
:undoc-members:
:show-inheritance:


.. automodule:: ipykernel.log
:members:
:undoc-members:
:show-inheritance:


.. automodule:: ipykernel.parentpoller
:members:
:undoc-members:
:show-inheritance:


.. automodule:: ipykernel.trio_runner
:members:
:undoc-members:
:show-inheritance:


.. automodule:: ipykernel.zmqshell
:members:
:undoc-members:
:show-inheritance:

Module contents
---------------

.. automodule:: ipykernel
:members:
:undoc-members:
:show-inheritance:
7 changes: 7 additions & 0 deletions docs/api/modules.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
ipykernel
=========

.. toctree::
:maxdepth: 4

ipykernel
1 change: 1 addition & 0 deletions docs/conf.py
Original file line number Diff line number Diff line change
@@ -34,6 +34,7 @@
"sphinx.ext.autodoc",
"sphinx.ext.intersphinx",
"sphinxcontrib_github_alt",
"sphinx_autodoc_typehints",
]

try:
3 changes: 2 additions & 1 deletion docs/index.rst
Original file line number Diff line number Diff line change
@@ -9,9 +9,10 @@ Most IPython kernel documentation is in the `IPython documentation <https://ipyt
Contents:

.. toctree::
:maxdepth: 2
:maxdepth: 1

changelog
API docs <api/modules>


Indices and tables
2 changes: 1 addition & 1 deletion ipykernel/_version.py
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
from typing import List

# Version string must appear intact for hatch versioning
__version__ = "6.20.0"
__version__ = "6.20.1"

# Build up version_info tuple for backwards compatibility
pattern = r"(?P<major>\d+).(?P<minor>\d+).(?P<patch>\d+)(?P<rest>.*)"
2 changes: 1 addition & 1 deletion ipykernel/comm/comm.py
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@
class BaseComm(comm.base_comm.BaseComm):
"""The base class for comms."""

kernel: Optional[Kernel] = None
kernel: Optional["Kernel"] = None

def publish_msg(self, msg_type, data=None, metadata=None, buffers=None, **keys):
"""Helper for sending a comm message on IOPub"""
3 changes: 2 additions & 1 deletion ipykernel/connect.py
Original file line number Diff line number Diff line change
@@ -26,7 +26,8 @@ def get_connection_file(app=None):
from ipykernel.kernelapp import IPKernelApp

if not IPKernelApp.initialized():
raise RuntimeError("app not specified, and not in a running Kernel")
msg = "app not specified, and not in a running Kernel"
raise RuntimeError(msg)

app = IPKernelApp.instance()
return filefind(app.connection_file, [".", app.connection_dir])
2 changes: 1 addition & 1 deletion ipykernel/embed.py
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ def embed_kernel(module=None, local_ns=None, **kwargs):
The module to load into IPython globals (default: caller)
local_ns : dict, optional
The namespace to load into IPython user namespace (default: caller)
**kwargs : various, optional
kwargs : dict, optional
Further keyword args are relayed to the IPKernelApp constructor,
allowing configuration of the Kernel. Will only have an effect
on the first embed_kernel call for a given process.
Loading