diff --git a/srcpkgs/python3-jupyterlab_server/patches/openapi-core.patch b/srcpkgs/python3-jupyterlab_server/patches/openapi-core.patch new file mode 100644 index 00000000000..06a6ff866a5 --- /dev/null +++ b/srcpkgs/python3-jupyterlab_server/patches/openapi-core.patch @@ -0,0 +1,48 @@ +diff --git a/jupyterlab_server/spec.py b/jupyterlab_server/spec.py +index 94347b9..88b9c3e 100644 +--- a/jupyterlab_server/spec.py ++++ b/jupyterlab_server/spec.py +@@ -9,17 +9,17 @@ import typing + from pathlib import Path + + if typing.TYPE_CHECKING: +- from openapi_core.spec.paths import Spec ++ from jsonschema_path import SchemaPath + + HERE = Path(os.path.dirname(__file__)).resolve() + + +-def get_openapi_spec() -> Spec: ++def get_openapi_spec() -> SchemaPath: + """Get the OpenAPI spec object.""" +- from openapi_core.spec.paths import Spec ++ from jsonschema_path import SchemaPath + + openapi_spec_dict = get_openapi_spec_dict() +- return Spec.from_dict(openapi_spec_dict) # type:ignore[arg-type] ++ return SchemaPath.from_dict(openapi_spec_dict) # type:ignore[arg-type] + + + def get_openapi_spec_dict() -> dict[str, typing.Any]: +diff --git a/jupyterlab_server/test_utils.py b/jupyterlab_server/test_utils.py +index c1d8956..bf22e80 100644 +--- a/jupyterlab_server/test_utils.py ++++ b/jupyterlab_server/test_utils.py +@@ -14,7 +14,7 @@ from urllib.parse import parse_qs, urlparse + import tornado.httpclient + import tornado.web + from openapi_core import V30RequestValidator, V30ResponseValidator +-from openapi_core.spec.paths import Spec ++from jsonschema_path import SchemaPath + from openapi_core.validation.request.datatypes import RequestParameters + from tornado.httpclient import HTTPRequest, HTTPResponse + from werkzeug.datastructures import Headers, ImmutableMultiDict +@@ -32,7 +32,7 @@ class TornadoOpenAPIRequest: + Converts a torando request to an OpenAPI one + """ + +- def __init__(self, request: HTTPRequest, spec: Spec): ++ def __init__(self, request: HTTPRequest, spec: SchemaPath): + """Initialize the request.""" + self.request = request + self.spec = spec diff --git a/srcpkgs/python3-jupyterlab_server/template b/srcpkgs/python3-jupyterlab_server/template index 770a2fb33e8..92e7585d5ba 100644 --- a/srcpkgs/python3-jupyterlab_server/template +++ b/srcpkgs/python3-jupyterlab_server/template @@ -1,6 +1,6 @@ # Template file for 'python3-jupyterlab_server' pkgname=python3-jupyterlab_server -version=2.25.2 +version=2.25.4 revision=1 build_style=python3-pep517 hostmakedepends="hatchling" @@ -8,12 +8,12 @@ depends="python3-jupyter_server python3-Babel python3-json5 python3-requests" checkdepends="$depends python3-pytest-jupyter python3-openapi-core python3-requests-mock python3-strict-rfc3339 python3-ruamel.yaml python3-pip" short_desc="Server components for JupyterLab and JL-like applications" -maintainer="dkwo " +maintainer="dkwo , Gonzalo TornarĂ­a " license="BSD-3-Clause" homepage="https://github.com/jupyterlab/jupyterlab_server" changelog="https://raw.githubusercontent.com/jupyterlab/jupyterlab_server/main/CHANGELOG.md" distfiles="${PYPI_SITE}/j/jupyterlab_server/jupyterlab_server-${version}.tar.gz" -checksum=bd0ec7a99ebcedc8bcff939ef86e52c378e44c2707e053fcd81d046ce979ee63 +checksum=2098198e1e82e0db982440f9b5136175d73bea2cd42a6480aa6fd502cb23c4f9 if [ "$XBPS_BUILD_ENVIRONMENT" = void-packages-ci ]; then # tests setup fails on CI (no idea why)