Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-jupyter-server for
openSUSE:Factory checked in at 2024-01-15 22:19:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-jupyter-server (Old)
and /work/SRC/openSUSE:Factory/.python-jupyter-server.new.21961 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-jupyter-server"
Mon Jan 15 22:19:40 2024 rev:38 rq:1138728 version:2.12.4
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-jupyter-server/python-jupyter-server.changes
2023-12-25 19:05:48.930610376 +0100
+++
/work/SRC/openSUSE:Factory/.python-jupyter-server.new.21961/python-jupyter-server.changes
2024-01-15 22:19:53.768315069 +0100
@@ -1,0 +2,11 @@
+Sun Jan 14 20:34:00 UTC 2024 - Ben Greiner <[email protected]>
+
+- Update to 2.12.4
+ * Fix log arguments for gateway client error #1385 (@minrk)
+- Release 2.12.3
+ * Import User unconditionally #1384 (@yuvipanda)
+- Release 2.12.2
+ * Fix a typo in error message #1381 (@krassowski)
+ * Force legacy ws subprotocol when using gateway #1311 (@epignot)
+
+-------------------------------------------------------------------
Old:
----
jupyter_server-2.12.1.tar.gz
New:
----
jupyter_server-2.12.4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-jupyter-server.spec ++++++
--- /var/tmp/diff_new_pack.cpHiVx/_old 2024-01-15 22:19:54.468340796 +0100
+++ /var/tmp/diff_new_pack.cpHiVx/_new 2024-01-15 22:19:54.468340796 +0100
@@ -1,7 +1,7 @@
#
# spec file
#
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -32,7 +32,7 @@
%endif
Name: python-jupyter-server%{psuffix}
-Version: 2.12.1
+Version: 2.12.4
Release: 0
Summary: The backend to Jupyter web applications
License: BSD-3-Clause
@@ -70,9 +70,7 @@
Provides: python-jupyter_server = %{version}-%{release}
Obsoletes: python-jupyter_server < %{version}-%{release}
%if %{with test}
-BuildRequires: %{python_module flaky}
BuildRequires: %{python_module jupyter-server-test = %{version}}
-BuildRequires: %{python_module pytest-timeout}
BuildRequires: %{python_module pytest-xdist}
%endif
%if %{with libalternatives}
@@ -98,6 +96,7 @@
%package test
Summary: The backend to Jupyter web applications - test requirements
Group: Development/Languages/Python
+Requires: python-flaky
Requires: python-ipykernel
Requires: python-jupyter-server = %{version}
Requires: python-pytest >= 7
++++++ jupyter_server-2.12.1.tar.gz -> jupyter_server-2.12.4.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jupyter_server-2.12.1/.github/dependabot.yml
new/jupyter_server-2.12.4/.github/dependabot.yml
--- old/jupyter_server-2.12.1/.github/dependabot.yml 2020-02-02
01:00:00.000000000 +0100
+++ new/jupyter_server-2.12.4/.github/dependabot.yml 2020-02-02
01:00:00.000000000 +0100
@@ -5,6 +5,10 @@
directory: "/"
schedule:
interval: "weekly"
+ groups:
+ actions:
+ patterns:
+ - "*"
# Python
- package-ecosystem: "pip"
directory: "/"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jupyter_server-2.12.1/.github/workflows/downstream.yml
new/jupyter_server-2.12.4/.github/workflows/downstream.yml
--- old/jupyter_server-2.12.1/.github/workflows/downstream.yml 2020-02-02
01:00:00.000000000 +0100
+++ new/jupyter_server-2.12.4/.github/workflows/downstream.yml 2020-02-02
01:00:00.000000000 +0100
@@ -122,7 +122,7 @@
uses: jupyterlab/maintainer-tools/.github/actions/downstream-test@v1
with:
package_name: jupytext
- test_command: pip install pytest-jupyter[server] gitpython
pre-commit && python -m ipykernel install --name jupytext-dev --user && pytest
-vv -raXxs -W default --durations 10 --color=yes
--ignore=tests/test_doc_files_are_notebooks.py --ignore=tests/test_changelog.py
+ test_command: pip install pytest-jupyter[server] gitpython
pre-commit && python -m ipykernel install --name jupytext-dev --user && pytest
-vv -raXxs -W default --durations 10 --color=yes
downstream_check: # This job does nothing and is only used for the branch
protection
if: always()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jupyter_server-2.12.1/.pre-commit-config.yaml
new/jupyter_server-2.12.4/.pre-commit-config.yaml
--- old/jupyter_server-2.12.1/.pre-commit-config.yaml 2020-02-02
01:00:00.000000000 +0100
+++ new/jupyter_server-2.12.4/.pre-commit-config.yaml 2020-02-02
01:00:00.000000000 +0100
@@ -21,7 +21,7 @@
- id: trailing-whitespace
- repo: https://github.com/python-jsonschema/check-jsonschema
- rev: 0.27.2
+ rev: 0.27.3
hooks:
- id: check-github-workflows
@@ -33,17 +33,11 @@
[mdformat-gfm, mdformat-frontmatter, mdformat-footnote]
- repo: https://github.com/pre-commit/mirrors-prettier
- rev: "v3.1.0"
+ rev: "v4.0.0-alpha.8"
hooks:
- id: prettier
types_or: [yaml, html, json]
- - repo: https://github.com/adamchainz/blacken-docs
- rev: "1.16.0"
- hooks:
- - id: blacken-docs
- additional_dependencies: [black==23.7.0]
-
- repo: https://github.com/codespell-project/codespell
rev: "v2.2.6"
hooks:
@@ -58,7 +52,7 @@
- id: rst-inline-touching-normal
- repo: https://github.com/pre-commit/mirrors-mypy
- rev: "v1.7.1"
+ rev: "v1.8.0"
hooks:
- id: mypy
files: jupyter_server
@@ -67,7 +61,7 @@
["traitlets>=5.13", "jupyter_core>=5.5", "jupyter_client>=8.5"]
- repo: https://github.com/astral-sh/ruff-pre-commit
- rev: v0.1.6
+ rev: v0.1.9
hooks:
- id: ruff
types_or: [python, jupyter]
@@ -76,7 +70,7 @@
types_or: [python, jupyter]
- repo: https://github.com/scientific-python/cookie
- rev: "2023.11.17"
+ rev: "2023.12.21"
hooks:
- id: sp-repo-review
additional_dependencies: ["repo-review[cli]"]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jupyter_server-2.12.1/.readthedocs.yaml
new/jupyter_server-2.12.4/.readthedocs.yaml
--- old/jupyter_server-2.12.1/.readthedocs.yaml 2020-02-02 01:00:00.000000000
+0100
+++ new/jupyter_server-2.12.4/.readthedocs.yaml 2020-02-02 01:00:00.000000000
+0100
@@ -12,3 +12,8 @@
path: .
extra_requirements:
- docs
+formats:
+ - epub
+ - htmlzip
+ # TODO: evaluate, see
https://github.com/jupyter-server/jupyter_server/issues/1378
+ # - pdf
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jupyter_server-2.12.1/CHANGELOG.md
new/jupyter_server-2.12.4/CHANGELOG.md
--- old/jupyter_server-2.12.1/CHANGELOG.md 2020-02-02 01:00:00.000000000
+0100
+++ new/jupyter_server-2.12.4/CHANGELOG.md 2020-02-02 01:00:00.000000000
+0100
@@ -4,6 +4,65 @@
<!-- <START NEW CHANGELOG ENTRY> -->
+## 2.12.4
+
+([Full
Changelog](https://github.com/jupyter-server/jupyter_server/compare/v2.12.3...7bb21b45392c889b5c87eb0d1b48662a497ba15a))
+
+### Bugs fixed
+
+- Fix log arguments for gateway client error
[#1385](https://github.com/jupyter-server/jupyter_server/pull/1385)
([@minrk](https://github.com/minrk))
+
+### Contributors to this release
+
+([GitHub contributors page for this
release](https://github.com/jupyter-server/jupyter_server/graphs/contributors?from=2024-01-09&to=2024-01-11&type=c))
+
+[@minrk](https://github.com/search?q=repo%3Ajupyter-server%2Fjupyter_server+involves%3Aminrk+updated%3A2024-01-09..2024-01-11&type=Issues)
+
+<!-- <END NEW CHANGELOG ENTRY> -->
+
+## 2.12.3
+
+([Full
Changelog](https://github.com/jupyter-server/jupyter_server/compare/v2.12.2...99b9126853b69aafb700b4c92b50b83b7ca00e32))
+
+### Bugs fixed
+
+- Import User unconditionally
[#1384](https://github.com/jupyter-server/jupyter_server/pull/1384)
([@yuvipanda](https://github.com/yuvipanda))
+
+### Maintenance and upkeep improvements
+
+- Simplify the jupytext downstream test
[#1383](https://github.com/jupyter-server/jupyter_server/pull/1383)
([@mwouts](https://github.com/mwouts))
+- Fix test param for pytest-xdist
[#1382](https://github.com/jupyter-server/jupyter_server/pull/1382)
([@tornaria](https://github.com/tornaria))
+
+### Contributors to this release
+
+([GitHub contributors page for this
release](https://github.com/jupyter-server/jupyter_server/graphs/contributors?from=2024-01-04&to=2024-01-09&type=c))
+
+[@mwouts](https://github.com/search?q=repo%3Ajupyter-server%2Fjupyter_server+involves%3Amwouts+updated%3A2024-01-04..2024-01-09&type=Issues)
|
[@tornaria](https://github.com/search?q=repo%3Ajupyter-server%2Fjupyter_server+involves%3Atornaria+updated%3A2024-01-04..2024-01-09&type=Issues)
|
[@welcome](https://github.com/search?q=repo%3Ajupyter-server%2Fjupyter_server+involves%3Awelcome+updated%3A2024-01-04..2024-01-09&type=Issues)
|
[@yuvipanda](https://github.com/search?q=repo%3Ajupyter-server%2Fjupyter_server+involves%3Ayuvipanda+updated%3A2024-01-04..2024-01-09&type=Issues)
+
+## 2.12.2
+
+([Full
Changelog](https://github.com/jupyter-server/jupyter_server/compare/v2.12.1...49915685531ce90baae9d2a4d6baa9c533beffcc))
+
+### Bugs fixed
+
+- Fix a typo in error message
[#1381](https://github.com/jupyter-server/jupyter_server/pull/1381)
([@krassowski](https://github.com/krassowski))
+- Force legacy ws subprotocol when using gateway
[#1311](https://github.com/jupyter-server/jupyter_server/pull/1311)
([@epignot](https://github.com/epignot))
+
+### Maintenance and upkeep improvements
+
+- Update pre-commit deps
[#1380](https://github.com/jupyter-server/jupyter_server/pull/1380)
([@blink1073](https://github.com/blink1073))
+- Use ruff docstring-code-format
[#1377](https://github.com/jupyter-server/jupyter_server/pull/1377)
([@blink1073](https://github.com/blink1073))
+
+### Documentation improvements
+
+- Enable htmlzip and epub on readthedocs
[#1379](https://github.com/jupyter-server/jupyter_server/pull/1379)
([@bollwyvl](https://github.com/bollwyvl))
+
+### Contributors to this release
+
+([GitHub contributors page for this
release](https://github.com/jupyter-server/jupyter_server/graphs/contributors?from=2023-12-06&to=2024-01-04&type=c))
+
+[@blink1073](https://github.com/search?q=repo%3Ajupyter-server%2Fjupyter_server+involves%3Ablink1073+updated%3A2023-12-06..2024-01-04&type=Issues)
|
[@bollwyvl](https://github.com/search?q=repo%3Ajupyter-server%2Fjupyter_server+involves%3Abollwyvl+updated%3A2023-12-06..2024-01-04&type=Issues)
|
[@epignot](https://github.com/search?q=repo%3Ajupyter-server%2Fjupyter_server+involves%3Aepignot+updated%3A2023-12-06..2024-01-04&type=Issues)
|
[@krassowski](https://github.com/search?q=repo%3Ajupyter-server%2Fjupyter_server+involves%3Akrassowski+updated%3A2023-12-06..2024-01-04&type=Issues)
+
## 2.12.1
([Full
Changelog](https://github.com/jupyter-server/jupyter_server/compare/v2.12.0...a59beb9b7bf3decc00af782821561435f47bbb16))
@@ -19,8 +78,6 @@
[@minrk](https://github.com/search?q=repo%3Ajupyter-server%2Fjupyter_server+involves%3Aminrk+updated%3A2023-12-05..2023-12-06&type=Issues)
|
[@Zsailer](https://github.com/search?q=repo%3Ajupyter-server%2Fjupyter_server+involves%3AZsailer+updated%3A2023-12-05..2023-12-06&type=Issues)
-<!-- <END NEW CHANGELOG ENTRY> -->
-
## 2.12.0
([Full
Changelog](https://github.com/jupyter-server/jupyter_server/compare/v2.11.2...3bd347b6f2ead5897a18c6171db1174eaaf6176d))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jupyter_server-2.12.1/PKG-INFO
new/jupyter_server-2.12.4/PKG-INFO
--- old/jupyter_server-2.12.1/PKG-INFO 2020-02-02 01:00:00.000000000 +0100
+++ new/jupyter_server-2.12.4/PKG-INFO 2020-02-02 01:00:00.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: jupyter_server
-Version: 2.12.1
+Version: 2.12.4
Summary: The backendâi.e. core services, APIs, and REST endpointsâto
Jupyter web applications.
Project-URL: Homepage, https://jupyter-server.readthedocs.io
Project-URL: Documentation, https://jupyter-server.readthedocs.io
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jupyter_server-2.12.1/examples/simple/pyproject.toml
new/jupyter_server-2.12.4/examples/simple/pyproject.toml
--- old/jupyter_server-2.12.1/examples/simple/pyproject.toml 2020-02-02
01:00:00.000000000 +0100
+++ new/jupyter_server-2.12.4/examples/simple/pyproject.toml 2020-02-02
01:00:00.000000000 +0100
@@ -31,6 +31,9 @@
[tool.hatch.build.targets.wheel.shared-data]
"etc/jupyter/jupyter_server_config.d" = "etc/jupyter/jupyter_server_config.d"
+[tool.hatch.build.targets.wheel]
+packages = ["simple_ext1", "simple_ext2", "simple_ext11"]
+
[tool.hatch.build.hooks.jupyter-builder]
dependencies = [
"hatch-jupyter-builder>=0.8.2",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jupyter_server-2.12.1/jupyter_server/_version.py
new/jupyter_server-2.12.4/jupyter_server/_version.py
--- old/jupyter_server-2.12.1/jupyter_server/_version.py 2020-02-02
01:00:00.000000000 +0100
+++ new/jupyter_server-2.12.4/jupyter_server/_version.py 2020-02-02
01:00:00.000000000 +0100
@@ -6,7 +6,7 @@
from typing import List
# Version string must appear intact for automatic versioning
-__version__ = "2.12.1"
+__version__ = "2.12.4"
# Build up version_info tuple for backwards compatibility
pattern = r"(?P<major>\d+).(?P<minor>\d+).(?P<patch>\d+)(?P<rest>.*)"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jupyter_server-2.12.1/jupyter_server/auth/security.py
new/jupyter_server-2.12.4/jupyter_server/auth/security.py
--- old/jupyter_server-2.12.1/jupyter_server/auth/security.py 2020-02-02
01:00:00.000000000 +0100
+++ new/jupyter_server-2.12.4/jupyter_server/auth/security.py 2020-02-02
01:00:00.000000000 +0100
@@ -41,7 +41,7 @@
Examples
--------
- >>> passwd('mypassword') # doctest: +ELLIPSIS
+ >>> passwd("mypassword") # doctest: +ELLIPSIS
'argon2:...'
"""
@@ -93,15 +93,14 @@
Examples
--------
- >>> myhash = passwd('mypassword')
- >>> passwd_check(myhash, 'mypassword')
+ >>> myhash = passwd("mypassword")
+ >>> passwd_check(myhash, "mypassword")
True
- >>> passwd_check(myhash, 'otherpassword')
+ >>> passwd_check(myhash, "otherpassword")
False
- >>>
passwd_check('sha1:0e112c3ddfce:a68df677475c2b47b6e86d0467eec97ac5f4b85a',
- ... 'mypassword')
+ >>>
passwd_check("sha1:0e112c3ddfce:a68df677475c2b47b6e86d0467eec97ac5f4b85a",
"mypassword")
True
"""
if hashed_passphrase.startswith("argon2:"):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jupyter_server-2.12.1/jupyter_server/base/handlers.py
new/jupyter_server-2.12.4/jupyter_server/base/handlers.py
--- old/jupyter_server-2.12.1/jupyter_server/base/handlers.py 2020-02-02
01:00:00.000000000 +0100
+++ new/jupyter_server-2.12.4/jupyter_server/base/handlers.py 2020-02-02
01:00:00.000000000 +0100
@@ -30,6 +30,7 @@
from jupyter_server._sysinfo import get_sys_info
from jupyter_server._tz import utcnow
from jupyter_server.auth.decorator import authorized
+from jupyter_server.auth.identity import User
from jupyter_server.i18n import combine_translations
from jupyter_server.services.security import csp_report_uri
from jupyter_server.utils import (
@@ -47,7 +48,7 @@
from tornado.concurrent import Future
from jupyter_server.auth.authorizer import Authorizer
- from jupyter_server.auth.identity import IdentityProvider, User
+ from jupyter_server.auth.identity import IdentityProvider
from jupyter_server.serverapp import ServerApp
from jupyter_server.services.config.manager import ConfigManager
from jupyter_server.services.contents.manager import ContentsManager
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jupyter_server-2.12.1/jupyter_server/gateway/connections.py
new/jupyter_server-2.12.4/jupyter_server/gateway/connections.py
--- old/jupyter_server-2.12.1/jupyter_server/gateway/connections.py
2020-02-02 01:00:00.000000000 +0100
+++ new/jupyter_server-2.12.4/jupyter_server/gateway/connections.py
2020-02-02 01:00:00.000000000 +0100
@@ -13,7 +13,7 @@
from tornado.escape import json_decode, url_escape, utf8
from tornado.httpclient import HTTPRequest
from tornado.ioloop import IOLoop
-from traitlets import Bool, Instance, Int
+from traitlets import Bool, Instance, Int, Unicode
from ..services.kernels.connection.base import BaseKernelWebsocketConnection
from ..utils import url_path_join
@@ -31,6 +31,11 @@
retry = Int(0)
+ # When opening ws connection to gateway, server already negotiated
subprotocol with notebook client.
+ # Same protocol must be used for client and gateway, so legacy ws
subprotocol for client is enforced here.
+
+ kernel_ws_protocol = Unicode("", allow_none=True, config=True)
+
async def connect(self):
"""Connect to the socket."""
# websocket is initialized before connection
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jupyter_server-2.12.1/jupyter_server/gateway/gateway_client.py
new/jupyter_server-2.12.4/jupyter_server/gateway/gateway_client.py
--- old/jupyter_server-2.12.1/jupyter_server/gateway/gateway_client.py
2020-02-02 01:00:00.000000000 +0100
+++ new/jupyter_server-2.12.4/jupyter_server/gateway/gateway_client.py
2020-02-02 01:00:00.000000000 +0100
@@ -757,11 +757,12 @@
async def gateway_request(endpoint: str, **kwargs: ty.Any) -> HTTPResponse:
"""Make an async request to kernel gateway endpoint, returns a response"""
- kwargs = GatewayClient.instance().load_connection_args(**kwargs)
+ gateway_client = GatewayClient.instance()
+ kwargs = gateway_client.load_connection_args(**kwargs)
rhc = RetryableHTTPClient()
try:
response = await rhc.fetch(endpoint, **kwargs)
- GatewayClient.instance().emit(
+ gateway_client.emit(
data={STATUS_KEY: SUCCESS_STATUS, STATUS_CODE_KEY: 200,
MESSAGE_KEY: "success"}
)
# Trap a set of common exceptions so that we can inform the user that
their Gateway url is incorrect
@@ -769,10 +770,12 @@
# NOTE: We do this here since this handler is called during the server's
startup and subsequent refreshes
# of the tree view.
except HTTPClientError as e:
- GatewayClient.instance().emit(
+ gateway_client.emit(
data={STATUS_KEY: ERROR_STATUS, STATUS_CODE_KEY: e.code,
MESSAGE_KEY: str(e.message)}
)
- error_reason = f"Exception while attempting to connect to Gateway
server url '{GatewayClient.instance().url}'"
+ error_reason = (
+ f"Exception while attempting to connect to Gateway server url
'{gateway_client.url}'"
+ )
error_message = e.message
if e.response:
try:
@@ -788,38 +791,39 @@
"Ensure gateway url is valid and the Gateway instance is running.",
) from e
except ConnectionError as e:
- GatewayClient.instance().emit(
+ gateway_client.emit(
data={STATUS_KEY: ERROR_STATUS, STATUS_CODE_KEY: 503, MESSAGE_KEY:
str(e)}
)
raise web.HTTPError(
503,
- f"ConnectionError was received from Gateway server url
'{GatewayClient.instance().url}'. "
+ f"ConnectionError was received from Gateway server url
'{gateway_client.url}'. "
"Check to be sure the Gateway instance is running.",
) from e
except gaierror as e:
- GatewayClient.instance().emit(
+ gateway_client.emit(
data={STATUS_KEY: ERROR_STATUS, STATUS_CODE_KEY: 404, MESSAGE_KEY:
str(e)}
)
raise web.HTTPError(
404,
- f"The Gateway server specified in the gateway_url
'{GatewayClient.instance().url}' doesn't "
+ f"The Gateway server specified in the gateway_url
'{gateway_client.url}' doesn't "
f"appear to be valid. Ensure gateway url is valid and the Gateway
instance is running.",
) from e
except Exception as e:
- GatewayClient.instance().emit(
+ gateway_client.emit(
data={STATUS_KEY: ERROR_STATUS, STATUS_CODE_KEY: 505, MESSAGE_KEY:
str(e)}
)
logging.getLogger("ServerApp").error(
- f"Exception while trying to launch kernel via Gateway URL
{GatewayClient.instance().url} , {e}",
+ "Exception while trying to launch kernel via Gateway URL %s: %s",
+ gateway_client.url,
e,
)
raise e
- if GatewayClient.instance().accept_cookies:
+ if gateway_client.accept_cookies:
# Update cookies on GatewayClient from server if configured.
cookie_values = response.headers.get("Set-Cookie")
if cookie_values:
cookie: SimpleCookie = SimpleCookie()
cookie.load(cookie_values)
- GatewayClient.instance().update_cookies(cookie)
+ gateway_client.update_cookies(cookie)
return response
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jupyter_server-2.12.1/jupyter_server/services/contents/filemanager.py
new/jupyter_server-2.12.4/jupyter_server/services/contents/filemanager.py
--- old/jupyter_server-2.12.1/jupyter_server/services/contents/filemanager.py
2020-02-02 01:00:00.000000000 +0100
+++ new/jupyter_server-2.12.4/jupyter_server/services/contents/filemanager.py
2020-02-02 01:00:00.000000000 +0100
@@ -1025,7 +1025,7 @@
try:
send2trash(os_path)
except OSError as e:
- raise web.HTTPError(400, "send2trash f`1ailed: %s" % e) from e
+ raise web.HTTPError(400, "send2trash failed: %s" % e) from e
return
if os.path.isdir(os_path):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jupyter_server-2.12.1/jupyter_server/utils.py
new/jupyter_server-2.12.4/jupyter_server/utils.py
--- old/jupyter_server-2.12.1/jupyter_server/utils.py 2020-02-02
01:00:00.000000000 +0100
+++ new/jupyter_server-2.12.4/jupyter_server/utils.py 2020-02-02
01:00:00.000000000 +0100
@@ -344,11 +344,11 @@
path dirs is given, the filename is tested as is, after running through
:func:`expandvars` and :func:`expanduser`. Thus a simple call::
- filefind('myfile.txt')
+ filefind("myfile.txt")
will find the file in the current working dir, but::
- filefind('~/myfile.txt')
+ filefind("~/myfile.txt")
Will find the file in the users home directory. This function does not
automatically try any paths, such as the cwd or the user's home directory.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jupyter_server-2.12.1/pyproject.toml
new/jupyter_server-2.12.4/pyproject.toml
--- old/jupyter_server-2.12.1/pyproject.toml 2020-02-02 01:00:00.000000000
+0100
+++ new/jupyter_server-2.12.4/pyproject.toml 2020-02-02 01:00:00.000000000
+0100
@@ -142,6 +142,9 @@
[tool.ruff]
line-length = 100
+[tool.ruff.format]
+docstring-code-format = true
+
[tool.ruff.lint]
select = [
"B", # flake8-bugbear
@@ -295,4 +298,4 @@
ignore = ["W002"]
[tool.repo-review]
-ignore = ["GH102"]
+ignore = ["GH102", "PC111"]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jupyter_server-2.12.1/tests/test_gateway.py
new/jupyter_server-2.12.4/tests/test_gateway.py
--- old/jupyter_server-2.12.1/tests/test_gateway.py 2020-02-02
01:00:00.000000000 +0100
+++ new/jupyter_server-2.12.4/tests/test_gateway.py 2020-02-02
01:00:00.000000000 +0100
@@ -373,15 +373,12 @@
GatewayClient.clear_instance()
-cookie_expire_time = format_datetime(datetime.now(tz=timezone.utc) +
timedelta(seconds=180))
-
-
@pytest.mark.parametrize(
"accept_cookies,expire_arg,expire_param,existing_cookies,cookie_exists",
[
(False, None, None, "EXISTING=1", False),
(True, None, None, "EXISTING=1", True),
- (True, "Expires", cookie_expire_time, None, True),
+ (True, "Expires", 180, None, True),
(True, "Max-Age", "-360", "EXISTING=1", False),
],
)
@@ -400,6 +397,10 @@
cookie: SimpleCookie = SimpleCookie()
cookie.load("SERVERID=1234567; Path=/")
+ if expire_arg == "Expires":
+ expire_param = format_datetime(
+ datetime.now(tz=timezone.utc) + timedelta(seconds=expire_param)
+ )
if expire_arg:
cookie["SERVERID"][expire_arg] = expire_param
