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: jupyter-server/jupyter_server
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v2.0.0rc5
Choose a base ref
...
head repository: jupyter-server/jupyter_server
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: cd060da67aa6e3e5d8ff791f0a559a91282be2b3
Choose a head ref
  • 3 commits
  • 4 files changed
  • 3 contributors

Commits on Nov 21, 2022

  1. Bump to 2.0.0.dev0

    @blink1073
    blink1073 committed Nov 21, 2022
    Copy the full SHA
    96a4f6a View commit details

  2. Tornado WebSocketHandler fixup (#1083) 

    * Tornado WebSocketHandler fixup

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
    @davidbrochart @pre-commit-ci
    davidbrochart and pre-commit-ci[bot] authored Nov 21, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5f84e96 View commit details

  3. [pre-commit.ci] pre-commit autoupdate (#1082) 

    updates:
- [github.com/pre-commit/mirrors-mypy: v0.990 → v0.991](pre-commit/mirrors-mypy@v0.990...v0.991)
- [github.com/john-hen/Flake8-pyproject: 1.1.0.post0 → 1.2.0](john-hen/Flake8-pyproject@1.1.0.post0...1.2.0)
- [github.com/pre-commit/mirrors-eslint: v8.27.0 → v8.28.0](pre-commit/mirrors-eslint@v8.27.0...v8.28.0)
- [github.com/python-jsonschema/check-jsonschema: 0.19.1 → 0.19.2](python-jsonschema/check-jsonschema@0.19.1...0.19.2)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
    @pre-commit-ci
    pre-commit-ci[bot] authored Nov 21, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    cd060da View commit details
Showing with 8 additions and 6 deletions.
  1. +4 −4 .pre-commit-config.yaml
  2. +1 −1 jupyter_server/_version.py
  3. +2 −0 jupyter_server/base/zmqhandlers.py
  4. +1 −1 jupyter_server/services/kernels/connection/channels.py
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
View file
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ repos:
files: \.py$

- repo: https://github.com/pre-commit/mirrors-mypy
rev: v0.990
rev: v0.991
hooks:
- id: mypy
additional_dependencies: [types-requests]
@@ -61,7 +61,7 @@ repos:
stages: [manual]

- repo: https://github.com/john-hen/Flake8-pyproject
rev: 1.1.0.post0
rev: 1.2.0
hooks:
- id: Flake8-pyproject
alias: flake8
@@ -70,12 +70,12 @@ repos:
stages: [manual]

- repo: https://github.com/pre-commit/mirrors-eslint
rev: v8.27.0
rev: v8.28.0
hooks:
- id: eslint
stages: [manual]

- repo: https://github.com/python-jsonschema/check-jsonschema
rev: 0.19.1
rev: 0.19.2
hooks:
- id: check-github-workflows
2 changes: 1 addition & 1 deletion jupyter_server/_version.py
View file
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
from typing import List

# Version string must appear intact for automatic versioning
__version__ = "2.0.0rc5"
__version__ = "2.0.0.dev0"

# Build up version_info tuple for backwards compatibility
pattern = r"(?P<major>\d+).(?P<minor>\d+).(?P<patch>\d+)(?P<rest>.*)"
2 changes: 2 additions & 0 deletions jupyter_server/base/zmqhandlers.py
View file
Original file line number Diff line number Diff line change
@@ -2,6 +2,8 @@
# Raise a warning that this module is deprecated.
import warnings

from tornado.websocket import WebSocketHandler

from jupyter_server.base.websocket import WebSocketMixin
from jupyter_server.services.kernels.connection.base import (
deserialize_binary_message,
2 changes: 1 addition & 1 deletion jupyter_server/services/kernels/connection/channels.py
View file
Original file line number Diff line number Diff line change
@@ -281,7 +281,7 @@ async def _register_session(self):
stale_handler = self._open_sessions.get(self.session_key)
if stale_handler:
self.log.warning("Replacing stale connection: %s", self.session_key)
await stale_handler.close()
stale_handler.close()
if (
self.kernel_id in self.multi_kernel_manager
): # only update open sessions if kernel is actively managed