From b6ad23b80972c287b53fd72055509ca7abc33bfb Mon Sep 17 00:00:00 2001 From: dkwo Date: Thu, 3 Feb 2022 13:50:20 +0100 Subject: [PATCH 01/15] python3-bleach: update to 4.1.0 --- srcpkgs/python3-bleach/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-bleach/template b/srcpkgs/python3-bleach/template index 21fec4f4b37c..2b8af3b8fbba 100644 --- a/srcpkgs/python3-bleach/template +++ b/srcpkgs/python3-bleach/template @@ -1,7 +1,7 @@ # Template file for 'python3-bleach' pkgname=python3-bleach -version=3.3.0 -revision=2 +version=4.1.0 +revision=1 wrksrc="bleach-${version}" build_style=python3-module hostmakedepends="python3-setuptools" @@ -13,4 +13,4 @@ license="Apache-2.0" homepage="https://github.com/mozilla/bleach" changelog="https://raw.githubusercontent.com/mozilla/bleach/master/CHANGES" distfiles="${PYPI_SITE}/b/bleach/bleach-${version}.tar.gz" -checksum=98b3170739e5e83dd9dc19633f074727ad848cbedb6026708c8ac2d3b697a433 +checksum=0900d8b37eba61a802ee40ac0061f8c2b5dee29c1927dd1d233e075ebf5a71da From a692f360b3e110c8c54ef89038738e6e4f611832 Mon Sep 17 00:00:00 2001 From: dkwo Date: Thu, 3 Feb 2022 13:51:55 +0100 Subject: [PATCH 02/15] python3-defusedxml: update to 0.7.1 --- srcpkgs/python3-defusedxml/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-defusedxml/template b/srcpkgs/python3-defusedxml/template index 06bdd57a3526..90dc454d120d 100644 --- a/srcpkgs/python3-defusedxml/template +++ b/srcpkgs/python3-defusedxml/template @@ -1,7 +1,7 @@ # Template file for 'python3-defusedxml' pkgname=python3-defusedxml -version=0.6.0 -revision=5 +version=0.7.1 +revision=1 wrksrc="defusedxml-${version}" build_style=python3-module hostmakedepends="python3-setuptools" @@ -11,7 +11,7 @@ maintainer="Orphaned " license="Python-2.0" homepage="https://github.com/tiran/defusedxml" distfiles="${PYPI_SITE}/d/defusedxml/defusedxml-${version}.tar.gz" -checksum=f684034d135af4c6cbb949b8a4d2ed61634515257a67299e5f940fbaa34377f5 +checksum=1bb3032db185915b62d7c6209c5a8792be6a32ab2fedacc84e01b52c51aa3e69 post_install() { vlicense LICENSE From 46bdd26800c3fb95fcc0eadb6477e98ceac3e4ae Mon Sep 17 00:00:00 2001 From: dkwo Date: Thu, 3 Feb 2022 13:54:30 +0100 Subject: [PATCH 03/15] python3-httplib2: update to 0.20.4 --- srcpkgs/python3-httplib2/template | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-httplib2/template b/srcpkgs/python3-httplib2/template index d0c39a478622..ac898ef2327f 100644 --- a/srcpkgs/python3-httplib2/template +++ b/srcpkgs/python3-httplib2/template @@ -1,7 +1,7 @@ # Template file for 'python3-httplib2' pkgname=python3-httplib2 -version=0.18.1 -revision=3 +version=0.20.4 +revision=1 create_wrksrc=yes build_wrksrc="httplib2-${version}" build_style=python3-module @@ -14,8 +14,10 @@ homepage="https://github.com/httplib2/httplib2" changelog="https://raw.githubusercontent.com/httplib2/httplib2/master/CHANGELOG" distfiles="${PYPI_SITE}/h/httplib2/httplib2-${version}.tar.gz https://raw.githubusercontent.com/httplib2/httplib2/master/LICENSE>LICENSE.txt" -checksum="8af66c1c52c7ffe1aa5dc4bcd7c769885254b0756e6e69f953c7f0ab49a70ba3 +checksum="58a98e45b4b1a48273073f905d2961666ecf0fbac4250ea5b47aef259eb5c585 589eec38f72df2be203711d3b8cbece9b908c5e7ff00bc3cab7f63bae9e366b4" +# Testing via this command is deprecated +make_check=no post_install() { # use system ca certificates From 753897708a7a56ee1c66cc8a0033122d769ee480 Mon Sep 17 00:00:00 2001 From: dkwo Date: Thu, 3 Feb 2022 13:55:53 +0100 Subject: [PATCH 04/15] python3-ipython_ipykernel: update to 6.8.0 --- srcpkgs/python3-ipython_ipykernel/template | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/srcpkgs/python3-ipython_ipykernel/template b/srcpkgs/python3-ipython_ipykernel/template index f00e0a3f1a0c..b75796ca0262 100644 --- a/srcpkgs/python3-ipython_ipykernel/template +++ b/srcpkgs/python3-ipython_ipykernel/template @@ -1,18 +1,19 @@ # Template file for 'python3-ipython_ipykernel' pkgname=python3-ipython_ipykernel -version=5.5.4 -revision=2 +version=6.8.0 +revision=1 wrksrc="ipykernel-${version}" build_style=python3-module hostmakedepends="python3-setuptools python3-ipython - python3-jupyter_client python3-traitlets python3-tornado" -depends="python3-ipython python3-traitlets python3-jupyter_client python3-tornado" + python3-jupyter_client python3-traitlets python3-tornado python3-entrypoints" +depends="python3-ipython python3-traitlets python3-jupyter_client + python3-tornado python3-entrypoints python3-nest_asyncio" short_desc="IPython kernel for Jupyter (Python3)" maintainer="Alessio Sergi " license="BSD-3-Clause" homepage="https://github.com/ipython/ipykernel" distfiles="${PYPI_SITE}/i/ipykernel/ipykernel-${version}.tar.gz" -checksum=1ce0e83672cc3bfdc1ffb5603e1d77ab125f24b41abc4612e22bfb3e994c0db2 +checksum=67d316d527eca24e3ded45a2b38689615bcda1aa520a11af0accdcea7152c18a # checks create a cycle with python3-jupyter_core and python3-jupyter_client make_check=no From 8c847ac10588b4f65004911ae71d36cf6c2b3302 Mon Sep 17 00:00:00 2001 From: dkwo Date: Thu, 3 Feb 2022 13:57:38 +0100 Subject: [PATCH 05/15] python3-jsonschema: update to 4.4.0 --- srcpkgs/python3-jsonschema/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-jsonschema/template b/srcpkgs/python3-jsonschema/template index 82f45e037865..120392ad1be3 100644 --- a/srcpkgs/python3-jsonschema/template +++ b/srcpkgs/python3-jsonschema/template @@ -1,6 +1,6 @@ # Template file for 'python3-jsonschema' pkgname=python3-jsonschema -version=4.2.1 +version=4.4.0 revision=1 wrksrc="jsonschema-${version}" build_style=python3-pep517 @@ -14,7 +14,7 @@ license="MIT" homepage="https://github.com/Julian/jsonschema" changelog="https://raw.githubusercontent.com/Julian/jsonschema/master/CHANGELOG.rst" distfiles="${PYPI_SITE}/j/jsonschema/jsonschema-${version}.tar.gz" -checksum=390713469ae64b8a58698bb3cbc3859abe6925b565a973f87323ef21b09a27a8 +checksum=636694eb41b3535ed608fe04129f26542b59ed99808b4f688aa32dcf55317a83 post_install() { vlicense COPYING LICENSE From 0d984eea8c73d86b9b825e07635ae02da0c30e75 Mon Sep 17 00:00:00 2001 From: dkwo Date: Thu, 3 Feb 2022 14:04:52 +0100 Subject: [PATCH 06/15] python3-jupyter_client: update to 7.1.2 --- srcpkgs/python3-jupyter_client/template | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/srcpkgs/python3-jupyter_client/template b/srcpkgs/python3-jupyter_client/template index be6aa5594095..b6ca0b980239 100644 --- a/srcpkgs/python3-jupyter_client/template +++ b/srcpkgs/python3-jupyter_client/template @@ -1,8 +1,7 @@ # Template file for 'python3-jupyter_client' pkgname=python3-jupyter_client -# delay 6.2 until jupyter/jupyter_console#241 is fixed -version=6.1.12 -revision=2 +version=7.1.1 +revision=1 wrksrc="jupyter_client-${version}" build_style=python3-module hostmakedepends="python3-setuptools" @@ -13,7 +12,7 @@ maintainer="Alessio Sergi " license="BSD-3-Clause" homepage="https://github.com/jupyter/jupyter_client" distfiles="${PYPI_SITE}/j/jupyter_client/jupyter_client-${version}.tar.gz" -checksum=c4bca1d0846186ca8be97f4d2fa6d2bae889cce4892a167ffa1ba6bd1f73e782 +checksum=540ca35e57e83c5ece81abd9b781a57cba39a37c60a2a30c8c1b2f6663544343 conflicts="python-jupyter_client<=5.2.4_2" # checks create a cycle with python3-jupyter_core and python3-ipython_ipykernel make_check=no From 80be48bfb340d7327bfe1c3f4e279391c4d1d3d5 Mon Sep 17 00:00:00 2001 From: dkwo Date: Thu, 3 Feb 2022 14:06:12 +0100 Subject: [PATCH 07/15] python3-jupyter_core: update to 4.9.1 --- srcpkgs/python3-jupyter_core/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-jupyter_core/template b/srcpkgs/python3-jupyter_core/template index d0fa364a6751..5f450d293d4f 100644 --- a/srcpkgs/python3-jupyter_core/template +++ b/srcpkgs/python3-jupyter_core/template @@ -1,7 +1,7 @@ # Template file for 'python3-jupyter_core' pkgname=python3-jupyter_core -version=4.7.1 -revision=2 +version=4.9.1 +revision=1 wrksrc="jupyter_core-${version}" build_style=python3-module hostmakedepends="python3-setuptools" @@ -11,7 +11,7 @@ maintainer="Alessio Sergi " license="BSD-3-Clause" homepage="https://jupyter.org" distfiles="${PYPI_SITE}/j/jupyter_core/jupyter_core-${version}.tar.gz" -checksum=79025cb3225efcd36847d0840f3fc672c0abd7afd0de83ba8a1d3837619122b4 +checksum=dce8a7499da5a53ae3afd5a9f4b02e5df1d57250cf48f3ad79da23b4778cd6fa conflicts="python-jupyter_core<=4.4.0_3" # checks create a cycle with python3-jypter_client and python3-ipython_ipykernel make_check=no From 65b272267916d74878041621de6edebcb83becb5 Mon Sep 17 00:00:00 2001 From: dkwo Date: Thu, 3 Feb 2022 14:07:34 +0100 Subject: [PATCH 08/15] python3-jupyter_notebook: update to 6.4.8 --- srcpkgs/python3-jupyter_notebook/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-jupyter_notebook/template b/srcpkgs/python3-jupyter_notebook/template index ca9e1d43df21..f1ec68546fd9 100644 --- a/srcpkgs/python3-jupyter_notebook/template +++ b/srcpkgs/python3-jupyter_notebook/template @@ -1,7 +1,7 @@ # Template file for 'python3-jupyter_notebook' pkgname=python3-jupyter_notebook -version=6.3.0 -revision=2 +version=6.4.8 +revision=1 wrksrc="notebook-${version}" build_style=python3-module hostmakedepends="python3-setuptools" @@ -15,7 +15,7 @@ maintainer="Alessio Sergi " license="BSD-3-Clause" homepage="https://jupyter.org/" distfiles="${PYPI_SITE}/n/notebook/notebook-${version}.tar.gz" -checksum=cbc9398d6c81473e9cdb891d2cae9c0d3718fca289dda6d26df5cb660fcadc7d +checksum=1e985c9dc6f678bdfffb9dc657306b5469bfa62d73e03f74e8defbf76d284312 conflicts="python-jupyter_notebook<=5.7.0_2" # Tests require unpackaged selenium make_check=no From fd0bd606a656b003473d262d25e7cc7ef3d414fc Mon Sep 17 00:00:00 2001 From: dkwo Date: Thu, 3 Feb 2022 14:14:36 +0100 Subject: [PATCH 09/15] python3-paramiko: update to 2.9.2 --- srcpkgs/python3-paramiko/template | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-paramiko/template b/srcpkgs/python3-paramiko/template index cff1b3a2fb59..a11808886b73 100644 --- a/srcpkgs/python3-paramiko/template +++ b/srcpkgs/python3-paramiko/template @@ -1,7 +1,7 @@ # Template file for 'python3-paramiko' pkgname=python3-paramiko -version=2.7.2 -revision=2 +version=2.9.2 +revision=1 wrksrc="${pkgname#*-}-${version}" build_style=python3-module hostmakedepends="python3-setuptools" @@ -11,4 +11,6 @@ maintainer="Orphaned " license="LGPL-2.1-or-later" homepage="http://www.paramiko.org/" distfiles="${PYPI_SITE}/p/paramiko/paramiko-${version}.tar.gz" -checksum=7f36f4ba2c0d81d219f4595e35f70d56cc94f9ac40a6acdf51d6ca210ce65035 +checksum=944a9e5dbdd413ab6c7951ea46b0ab40713235a9c4c5ca81cfe45c6f14fa677b +# Testing via this command is deprecated +make_check=no From 8f8119db01736aedf66355355dd4f56ee86dfa65 Mon Sep 17 00:00:00 2001 From: dkwo Date: Thu, 3 Feb 2022 14:16:02 +0100 Subject: [PATCH 10/15] python3-prometheus_client: update to 0.13.1 --- srcpkgs/python3-prometheus_client/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-prometheus_client/template b/srcpkgs/python3-prometheus_client/template index 82e4da1f3edd..739013270799 100644 --- a/srcpkgs/python3-prometheus_client/template +++ b/srcpkgs/python3-prometheus_client/template @@ -1,7 +1,7 @@ # Template file for 'python3-prometheus_client' pkgname=python3-prometheus_client -version=0.9.0 -revision=2 +version=0.13.1 +revision=1 wrksrc="prometheus_client-${version}" build_style=python3-module hostmakedepends="python3-setuptools" @@ -12,4 +12,4 @@ maintainer="Orphaned " license="Apache-2.0" homepage="https://github.com/prometheus/client_python" distfiles="${PYPI_SITE}/p/prometheus_client/prometheus_client-${version}.tar.gz" -checksum=9da7b32f02439d8c04f7777021c304ed51d9ec180604700c1ba72a4d44dceb03 +checksum=ada41b891b79fca5638bd5cfe149efa86512eaa55987893becd2c6d8d0a5dfc5 From 77789f4c8488fb9064505b087f61c2a85558a853 Mon Sep 17 00:00:00 2001 From: dkwo Date: Thu, 3 Feb 2022 14:17:21 +0100 Subject: [PATCH 11/15] python3-soupsieve: update to 2.3.1 --- srcpkgs/python3-soupsieve/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-soupsieve/template b/srcpkgs/python3-soupsieve/template index 14449f20c47f..06eb2b8b8895 100644 --- a/srcpkgs/python3-soupsieve/template +++ b/srcpkgs/python3-soupsieve/template @@ -1,7 +1,7 @@ # Template file for 'python3-soupsieve' pkgname=python3-soupsieve -version=1.9.5 -revision=6 +version=2.3.1 +revision=1 wrksrc="soupsieve-${version}" build_style=python3-module hostmakedepends="python3-setuptools" @@ -12,7 +12,7 @@ maintainer="Aluísio Augusto Silva Gonçalves " license="MIT" homepage="https://facelessuser.github.io/soupsieve/" distfiles="${PYPI_SITE}/s/soupsieve/soupsieve-${version}.tar.gz" -checksum=e2c1c5dee4a1c36bcb790e0fabd5492d874b8ebd4617622c4f6a731701060dda +checksum=b8d49b1cd4f037c7082a9683dfa1801aa2597fb11c3a1155b7a5b94829b4f1f9 post_install() { vlicense LICENSE.md From 2d38f129dcc7c2b90b3153dbf22d3ab1b7a00dd8 Mon Sep 17 00:00:00 2001 From: dkwo Date: Thu, 3 Feb 2022 14:20:35 +0100 Subject: [PATCH 12/15] python3-terminado: update to 0.13.0 --- srcpkgs/python3-terminado/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/python3-terminado/template b/srcpkgs/python3-terminado/template index 28c65c82ba99..e299a6ca8c4f 100644 --- a/srcpkgs/python3-terminado/template +++ b/srcpkgs/python3-terminado/template @@ -1,10 +1,10 @@ # Template file for 'python3-terminado' pkgname=python3-terminado -version=0.9.4 -revision=2 +version=0.13.0 +revision=1 wrksrc="terminado-${version}" build_style=python3-module -hostmakedepends="python3-setuptools" +hostmakedepends="python3-setuptools python3-tornado" depends="python3-ptyprocess python3-tornado" checkdepends="python3-pytest $depends" short_desc="Terminals served to term.js using Tornado websockets (Python3)" @@ -12,7 +12,7 @@ maintainer="Orphaned " license="BSD-2-Clause" homepage="https://github.com/takluyver/terminado" distfiles="${PYPI_SITE}/t/terminado/terminado-${version}.tar.gz" -checksum=9a7dbcfbc2778830eeb70261bf7aa9d98a3eac8631a3afe3febeb57c12f798be +checksum=713531ccb5db7d4f544651f14050da79809030f00d1afa21462088cf32fb143a post_install() { vlicense LICENSE From 8c4e593dec59e7572a7cbb72d8e95f47d17132e4 Mon Sep 17 00:00:00 2001 From: dkwo Date: Thu, 3 Feb 2022 16:27:01 +0100 Subject: [PATCH 13/15] python3-jupyter_console: add patches --- .../patches/pr258.patch | 22 ++ .../patches/upstream1.patch | 252 ++++++++++++++++++ srcpkgs/python3-jupyter_console/template | 2 +- 3 files changed, 275 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/python3-jupyter_console/patches/pr258.patch create mode 100644 srcpkgs/python3-jupyter_console/patches/upstream1.patch diff --git a/srcpkgs/python3-jupyter_console/patches/pr258.patch b/srcpkgs/python3-jupyter_console/patches/pr258.patch new file mode 100644 index 000000000000..7f3c6188c78e --- /dev/null +++ b/srcpkgs/python3-jupyter_console/patches/pr258.patch @@ -0,0 +1,22 @@ +From 7a68e9f630c5484159fddce1bb5718e26d592f32 Mon Sep 17 00:00:00 2001 +From: Jade Lovelace +Date: Sat, 1 Jan 2022 19:11:57 -0800 +Subject: [PATCH] Remove loop=loop in asyncio.wait call. Fix #245 + +--- + jupyter_console/ptshell.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/jupyter_console/ptshell.py b/jupyter_console/ptshell.py +index 31f424d..08f0342 100644 +--- a/jupyter_console/ptshell.py ++++ b/jupyter_console/ptshell.py +@@ -673,7 +673,7 @@ def mainloop(self): + # wish to include external content + tasks.append(self.handle_external_iopub(loop=loop)) + +- main_task = asyncio.wait(tasks, loop=loop, return_when=asyncio.FIRST_COMPLETED) ++ main_task = asyncio.wait(tasks, return_when=asyncio.FIRST_COMPLETED) + _, pending = loop.run_until_complete(main_task) + + for task in pending: diff --git a/srcpkgs/python3-jupyter_console/patches/upstream1.patch b/srcpkgs/python3-jupyter_console/patches/upstream1.patch new file mode 100644 index 000000000000..97cfb0ce3c8b --- /dev/null +++ b/srcpkgs/python3-jupyter_console/patches/upstream1.patch @@ -0,0 +1,252 @@ +From 0c7aca07d45ff009327599f6985c6a8ebbd98987 Mon Sep 17 00:00:00 2001 +From: David Brochart +Date: Tue, 1 Jun 2021 09:41:11 +0200 +Subject: [PATCH 1/5] Wrap jupyter_client's async functions with run_sync + +--- + .github/workflows/python-package.yml | 1 + + jupyter_console/ptshell.py | 16 +++++++++------- + 2 files changed, 10 insertions(+), 7 deletions(-) + +diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml +index eb8048e..fd5fcd0 100644 +--- a/.github/workflows/python-package.yml ++++ b/.github/workflows/python-package.yml +@@ -29,6 +29,7 @@ jobs: + pip install pytest pytest-cov + pip install . + python -m ipykernel.kernelspec --user ++ pip install https://github.com/jupyter/jupyter_client/archive/master.zip + - name: Test with pytest + run: | + pytest --cov jupyter_console +diff --git a/jupyter_console/ptshell.py b/jupyter_console/ptshell.py +index a9daeed..d6dc1e7 100644 +--- a/jupyter_console/ptshell.py ++++ b/jupyter_console/ptshell.py +@@ -76,6 +76,8 @@ + from pygments.util import ClassNotFound + from pygments.token import Token + ++from jupyter_client.utils import run_sync ++ + + def ask_yes_no(prompt, default=None, interrupt=None): + """Asks a question and returns a boolean (y/n) answer. +@@ -705,8 +707,8 @@ def run_cell(self, cell, store_history=True): + return + + # flush stale replies, which could have been ignored, due to missed heartbeats +- while self.client.shell_channel.msg_ready(): +- self.client.shell_channel.get_msg() ++ while run_sync(self.client.shell_channel.msg_ready)(): ++ run_sync(self.client.shell_channel.get_msg)() + # execute takes 'hidden', which is the inverse of store_hist + msg_id = self.client.execute(cell, not store_history) + +@@ -739,7 +741,7 @@ def run_cell(self, cell, store_history=True): + #----------------- + + def handle_execute_reply(self, msg_id, timeout=None): +- msg = self.client.shell_channel.get_msg(block=False, timeout=timeout) ++ msg = run_sync(self.client.shell_channel.get_msg)(block=False, timeout=timeout) + if msg["parent_header"].get("msg_id", None) == msg_id: + + self.handle_iopub(msg_id) +@@ -778,7 +780,7 @@ def handle_is_complete_reply(self, msg_id, timeout=None): + ## Get the is_complete response: + msg = None + try: +- msg = self.client.shell_channel.get_msg(block=True, timeout=timeout) ++ msg = run_sync(self.client.shell_channel.get_msg)(block=True, timeout=timeout) + except Empty: + warn('The kernel did not respond to an is_complete_request. ' + 'Setting `use_kernel_is_complete` to False.') +@@ -849,8 +851,8 @@ def handle_iopub(self, msg_id=''): + + It only displays output that is caused by this session. + """ +- while self.client.iopub_channel.msg_ready(): +- sub_msg = self.client.iopub_channel.get_msg() ++ while run_sync(self.client.iopub_channel.msg_ready)(): ++ sub_msg = run_sync(self.client.iopub_channel.get_msg)() + msg_type = sub_msg['header']['msg_type'] + + # Update execution_count in case it changed in another session +@@ -1003,7 +1005,7 @@ def handle_image_callable(self, data, mime): + def handle_input_request(self, msg_id, timeout=0.1): + """ Method to capture raw_input + """ +- req = self.client.stdin_channel.get_msg(timeout=timeout) ++ req = run_sync(self.client.stdin_channel.get_msg)(timeout=timeout) + # in case any iopub came while we were waiting: + self.handle_iopub(msg_id) + if msg_id == req["parent_header"].get("msg_id"): + +From 84a4c63f7c2b700357f5e5f730209dc4fc897c24 Mon Sep 17 00:00:00 2001 +From: David Brochart +Date: Wed, 2 Jun 2021 09:45:47 +0200 +Subject: [PATCH 2/5] Use run_sync only from jupyter_client 7.0+ + +--- + jupyter_console/completer.py | 12 +++++++++++- + jupyter_console/ptshell.py | 13 ++++++++++--- + 2 files changed, 21 insertions(+), 4 deletions(-) + +diff --git a/jupyter_console/completer.py b/jupyter_console/completer.py +index d0b7b9a..4b845e3 100644 +--- a/jupyter_console/completer.py ++++ b/jupyter_console/completer.py +@@ -7,6 +7,16 @@ + from traitlets.config import Configurable + from traitlets import Float + ++import jupyter_client ++ ++ ++# jupyter_client 7.0+ has async channel methods that we expect to be sync here ++if jupyter_client._version.version_info[0] >= 7: ++ from jupyter_client.utils import run_sync ++else: ++ run_sync = lambda x: x ++ ++ + class ZMQCompleter(Configurable): + """Client-side completion machinery. + +@@ -31,7 +41,7 @@ def complete_request(self, code, cursor_pos): + cursor_pos=cursor_pos, + ) + +- msg = self.client.shell_channel.get_msg(timeout=self.timeout) ++ msg = run_sync(self.client.shell_channel.get_msg)(timeout=self.timeout) + if msg['parent_header']['msg_id'] == msg_id: + return msg['content'] + +diff --git a/jupyter_console/ptshell.py b/jupyter_console/ptshell.py +index d6dc1e7..4608992 100644 +--- a/jupyter_console/ptshell.py ++++ b/jupyter_console/ptshell.py +@@ -76,7 +76,14 @@ + from pygments.util import ClassNotFound + from pygments.token import Token + +-from jupyter_client.utils import run_sync ++import jupyter_client ++ ++ ++# jupyter_client 7.0+ has async channel methods that we expect to be sync here ++if jupyter_client._version.version_info[0] >= 7: ++ from jupyter_client.utils import run_sync ++else: ++ run_sync = lambda x: x + + + def ask_yes_no(prompt, default=None, interrupt=None): +@@ -1034,6 +1041,6 @@ def double_int(sig, frame): + + # only send stdin reply if there *was not* another request + # or execution finished while we were reading. +- if not (self.client.stdin_channel.msg_ready() or +- self.client.shell_channel.msg_ready()): ++ if not (run_sync(self.client.stdin_channel.msg_ready)() or ++ run_sync(self.client.shell_channel.msg_ready)()): + self.client.input(raw_data) + +From 71bdcb5198ac7d79b246029965d945b5e726a6ed Mon Sep 17 00:00:00 2001 +From: David Brochart +Date: Wed, 2 Jun 2021 09:55:03 +0200 +Subject: [PATCH 3/5] Don't install jupyter_client master + +--- + .github/workflows/python-package.yml | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml +index fd5fcd0..eb8048e 100644 +--- a/.github/workflows/python-package.yml ++++ b/.github/workflows/python-package.yml +@@ -29,7 +29,6 @@ jobs: + pip install pytest pytest-cov + pip install . + python -m ipykernel.kernelspec --user +- pip install https://github.com/jupyter/jupyter_client/archive/master.zip + - name: Test with pytest + run: | + pytest --cov jupyter_console + +From 6620bdbecd66196721f9765a13659bdc26e28740 Mon Sep 17 00:00:00 2001 +From: David Brochart +Date: Wed, 15 Sep 2021 08:40:06 +0200 +Subject: [PATCH 4/5] Update jupyter_console/completer.py + +Co-authored-by: Matthias Bussonnier +--- + jupyter_console/completer.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/jupyter_console/completer.py b/jupyter_console/completer.py +index 4b845e3..6a38a6a 100644 +--- a/jupyter_console/completer.py ++++ b/jupyter_console/completer.py +@@ -11,7 +11,7 @@ + + + # jupyter_client 7.0+ has async channel methods that we expect to be sync here +-if jupyter_client._version.version_info[0] >= 7: ++if jupyter_client.version_info >= (7,): + from jupyter_client.utils import run_sync + else: + run_sync = lambda x: x + +From 7f2dc911b41df9ed7f3cdc09a6832451cbe69d15 Mon Sep 17 00:00:00 2001 +From: David Brochart +Date: Tue, 9 Nov 2021 14:27:16 +0100 +Subject: [PATCH 5/5] Drop block kwarg from get_msg() for jupyter_client>=7.0 + +--- + jupyter_console/ptshell.py | 13 +++++++++++-- + 1 file changed, 11 insertions(+), 2 deletions(-) + +diff --git a/jupyter_console/ptshell.py b/jupyter_console/ptshell.py +index 4608992..31f424d 100644 +--- a/jupyter_console/ptshell.py ++++ b/jupyter_console/ptshell.py +@@ -80,10 +80,13 @@ + + + # jupyter_client 7.0+ has async channel methods that we expect to be sync here ++# also, `block` was removed from `get_msg()` + if jupyter_client._version.version_info[0] >= 7: + from jupyter_client.utils import run_sync ++ JUPYTER_CLIENT_7 = True + else: + run_sync = lambda x: x ++ JUPYTER_CLIENT_7 = False + + + def ask_yes_no(prompt, default=None, interrupt=None): +@@ -748,7 +751,10 @@ def run_cell(self, cell, store_history=True): + #----------------- + + def handle_execute_reply(self, msg_id, timeout=None): +- msg = run_sync(self.client.shell_channel.get_msg)(block=False, timeout=timeout) ++ kwargs = {"timeout": timeout} ++ if not JUPYTER_CLIENT_7: ++ kwargs["block"] = False ++ msg = run_sync(self.client.shell_channel.get_msg)(**kwargs) + if msg["parent_header"].get("msg_id", None) == msg_id: + + self.handle_iopub(msg_id) +@@ -787,7 +793,10 @@ def handle_is_complete_reply(self, msg_id, timeout=None): + ## Get the is_complete response: + msg = None + try: +- msg = run_sync(self.client.shell_channel.get_msg)(block=True, timeout=timeout) ++ kwargs = {"timeout": timeout} ++ if not JUPYTER_CLIENT_7: ++ kwargs["block"] = True ++ msg = run_sync(self.client.shell_channel.get_msg)(**kwargs) + except Empty: + warn('The kernel did not respond to an is_complete_request. ' + 'Setting `use_kernel_is_complete` to False.') diff --git a/srcpkgs/python3-jupyter_console/template b/srcpkgs/python3-jupyter_console/template index 3124f3854a19..2971b9fe92c5 100644 --- a/srcpkgs/python3-jupyter_console/template +++ b/srcpkgs/python3-jupyter_console/template @@ -1,7 +1,7 @@ # Template file for 'python3-jupyter_console' pkgname=python3-jupyter_console version=6.4.0 -revision=2 +revision=3 wrksrc="jupyter_console-${version}" build_style=python3-module hostmakedepends="python3-setuptools" From b7f4b3214d8fa7f735bcd99368ab037c21645222 Mon Sep 17 00:00:00 2001 From: dkwo Date: Sun, 13 Feb 2022 11:34:43 +0100 Subject: [PATCH 14/15] python3-jupyter_server: update to 1.13.5 --- srcpkgs/python3-jupyter_server/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-jupyter_server/template b/srcpkgs/python3-jupyter_server/template index 4e6d8a6fe52a..e872ca652d59 100644 --- a/srcpkgs/python3-jupyter_server/template +++ b/srcpkgs/python3-jupyter_server/template @@ -1,6 +1,6 @@ # Template file for 'python3-jupyter_server' pkgname=python3-jupyter_server -version=1.13.4 +version=1.13.5 revision=1 wrksrc="jupyter_server-${version}" build_style=python3-module @@ -14,7 +14,7 @@ maintainer="dkwo " license="BSD-3-Clause" homepage="https://jupyter.org" distfiles="${PYPI_SITE}/j/jupyter-server/jupyter_server-${version}.tar.gz" -checksum=5fb5a219385338b1d13a013a68f54688b6a69ecff4e757fd230e27ecacdbf212 +checksum=9e3e9717eea3bffab8cfb2ff330011be6c8bbd9cdae5b71cef169fcece2f19d3 # Tarball defines no tests make_check=no From 9ebf1231f2090c545c8db2626069c2319c14f7bb Mon Sep 17 00:00:00 2001 From: dkwo Date: Sun, 13 Feb 2022 11:34:59 +0100 Subject: [PATCH 15/15] jupyterlab: update to 3.2.9 --- srcpkgs/jupyterlab/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/jupyterlab/template b/srcpkgs/jupyterlab/template index 330d959bc154..133fdab3b206 100644 --- a/srcpkgs/jupyterlab/template +++ b/srcpkgs/jupyterlab/template @@ -1,7 +1,7 @@ # Template file for 'jupyterlab' pkgname=jupyterlab -version=3.2.8 -revision=2 +version=3.2.9 +revision=1 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-jupyterlab_server nodejs python3-nbclassic @@ -11,7 +11,7 @@ maintainer="dkwo " license="custom:jupyterlab" homepage="https://jupyter.org" distfiles="${PYPI_SITE}/j/jupyterlab/jupyterlab-${version}.tar.gz" -checksum=5e4e99868c4f385372686767781408acbb9004b690b198b45597ba869802334b +checksum=65ddc34e5da1a764606e38c4f70cf9d4ac1c05182813cf0ab2dfea312c701124 # Tests require unpackaged dependencies make_check=no