From 00d56b88eb168522537df7c364fc20e2a3a7072b Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 23 Jan 2026 16:44:31 +0000 Subject: [PATCH] gnu: python-tornado: Update to 6.4.2. * gnu/packages/python-web.scm (python-tornado): Absorb definition of python-tornado-6. (python-tornado-5): New variable, inherit from python-tornado. (python-tornado-6): Deprecate variable. * gnu/packages/jupyter.scm (python-jupyterlite-core) * gnu/packages/jupyter.scm (python-pytest-jupyter) * gnu/packages/jupyter.scm (python-voila) * gnu/packages/python-xyz.scm (python-pypugjs) * gnu/packages/python-xyz.scm (python-tenacity): [native-inputs]: Remove python-tornado-6; add python-tornado. * gnu/packages/machine-learning.scm (kaldi-gstreamer-server): [inputs]: Remove python-tornado-6; add python-tornado. * gnu/packages/bioinformatics.scm (python-bulkvis) * gnu/packages/jupyter.scm (python-ipykernel) * gnu/packages/jupyter.scm (python-jupyter-client) * gnu/packages/jupyter.scm (python-jupyter-client-7) * gnu/packages/jupyter.scm (python-jupyter-server) * gnu/packages/jupyter.scm (python-nbclassic) * gnu/packages/jupyter.scm (python-nbdime) * gnu/packages/jupyter.scm (python-notebook) * gnu/packages/jupyter.scm (python-terminado) * gnu/packages/python-check.scm (python-pytest-tornasync) * gnu/packages/python-science.scm (python-distributed) * gnu/packages/python-xyz.scm (python-bokeh) * gnu/packages/python-xyz.scm (python-ipyparallel-bootstrap) * gnu/packages/python-xyz.scm (python-nbconvert) [propagated-inputs]: Remove python-tornado-6; add python-tornado. Change-Id: I437d73a0711c88e329666b6bc853f6332c277098 --- gnu/packages/bioinformatics.scm | 2 +- gnu/packages/jupyter.scm | 22 ++++----- gnu/packages/machine-learning.scm | 2 +- gnu/packages/python-check.scm | 2 +- gnu/packages/python-science.scm | 2 +- gnu/packages/python-web.scm | 74 ++++++++++++++----------------- gnu/packages/python-xyz.scm | 10 ++--- 7 files changed, 53 insertions(+), 61 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index ea5c6d45f41..935fb456cbc 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -2407,7 +2407,7 @@ from bokeh.util.dataclasses import entries\n")) python-scikit-image python-scipy python-seaborn - python-tornado-6 + python-tornado python-tqdm python-umap-learn)) (native-inputs (list python-pytest python-setuptools python-wheel)) diff --git a/gnu/packages/jupyter.scm b/gnu/packages/jupyter.scm index f11d4f094e6..21f539071e2 100644 --- a/gnu/packages/jupyter.scm +++ b/gnu/packages/jupyter.scm @@ -164,7 +164,7 @@ simulation, statistical modeling, machine learning and much more.") python-packaging python-psutil python-pyzmq - python-tornado-6 + python-tornado python-traitlets)) (inputs (list python)) ;for cross compilation (native-inputs @@ -291,7 +291,7 @@ Jupytext are: python-pyzmq python-send2trash python-terminado - python-tornado-6 + python-tornado python-traitlets)) (native-inputs (list python-nbval python-jupyter-packaging @@ -386,7 +386,7 @@ the namespace @code{/nbclassic/}.") python-pyzmq python-send2trash python-terminado - python-tornado-6 + python-tornado python-traitlets)) (native-inputs (list python-coverage @@ -478,7 +478,7 @@ to Jupyter Server for their Python Web application backend.") (list python-dateutil python-jupyter-core python-pyzmq - python-tornado-6 + python-tornado python-traitlets)) (home-page "https://jupyter.org/") (synopsis "Jupyter protocol implementation and client libraries") @@ -514,7 +514,7 @@ installing @code{kernelspec}s for use with Jupyter frontends.") python-jupyter-core python-nest-asyncio python-pyzmq - python-tornado-6 + python-tornado python-traitlets)))) ;; Bootstrap variant of jupyter-client, which breaks the loop between ipykernel @@ -773,7 +773,7 @@ Messaging Protocol}.") python-ipykernel python-pytest python-pytest-timeout - python-tornado-6)) + python-tornado)) (home-page "https://jupyter.org") (synopsis "Pytest plugin for testing Jupyter libraries and extensions.") (description @@ -812,7 +812,7 @@ extensions.") python-pytest-timeout)) (propagated-inputs (list python-ptyprocess - python-tornado-6)) + python-tornado)) (home-page "https://github.com/jupyter/terminado") (synopsis "Terminals served to term.js using Tornado websockets") (description "This package provides a Tornado websocket backend for the @@ -1106,7 +1106,7 @@ JavaScript build steps.") python-pyzmq python-send2trash python-terminado - python-tornado-6 + python-tornado python-traitlets python-websocket-client)) (native-inputs @@ -1188,7 +1188,7 @@ are interactive HTML widgets for Jupyter notebooks and the IPython kernel.") python-pytest-console-scripts python-pytest-cov python-pytest-xdist - python-tornado-6)) + python-tornado)) (home-page "https://github.com/jupyterlite/jupyterlite") (synopsis "Core functionality for building JupyterLite websites") (description "The jupyterlite-core package provides the core functionality @@ -1336,7 +1336,7 @@ It was formerly known as nbconvert's @code{ExecutePreprocessor.}") python-nbformat python-pygments python-requests - python-tornado-6)) + python-tornado)) (native-inputs (list git-minimal/pinned python-hatch-jupyter-builder @@ -1876,7 +1876,7 @@ rich media output.") python-pandas python-pytest python-pytest-tornasync - python-tornado-6 + python-tornado (origin (method url-fetch) (uri "https://unpkg.com/@jupyterlab/apputils@3.2.8/style/materialcolors.css") diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 00d80021aa8..f3bfa653ca9 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -3448,7 +3448,7 @@ exec ~a ~a~a \"$@\"~%" python-wrapper python-pygobject python-pyyaml - python-tornado-6)) + python-tornado)) (home-page "https://github.com/alumae/kaldi-gstreamer-server") (synopsis "Real-time full-duplex speech recognition server") (description "This is a real-time full-duplex speech recognition server, diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index 448080745b8..0d117dfc5b9 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -4221,7 +4221,7 @@ simplify testing of asynchronous tornado applications.") (list python-pytest-bootstrap python-setuptools)) (propagated-inputs - (list python-tornado-6)) + (list python-tornado)) (home-page "https://github.com/eukaryote/pytest-tornasync") (synopsis "Pytest plugin for testing Tornado code") (description diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm index cd02b6c0744..b4f99174a99 100644 --- a/gnu/packages/python-science.scm +++ b/gnu/packages/python-science.scm @@ -1043,7 +1043,7 @@ interoperability offered by HDF5.") python-sortedcontainers python-tblib python-toolz - python-tornado-6 + python-tornado python-urllib3 python-zict)) (home-page "https://distributed.dask.org") diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index b7ae2142915..89af6661aa2 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -5346,8 +5346,37 @@ data.") (define-public python-tornado (package - ;; TODO: Try to refresh and check all dependents. (name "python-tornado") + (version "6.4.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "tornado" version)) + (sha256 + (base32 "02v2mlvr58xg0l0gh08nswl53z73wkf23sziggypk63ffjsdbflj")))) + (build-system pyproject-build-system) + (arguments + (list + #:test-flags + ;; AttributeError: 'TestIOStreamWebMixin' object has no attribute 'io_loop' + #~(list "--ignore=tornado/test/iostream_test.py"))) + (native-inputs + (list python-certifi + python-pytest + python-setuptools)) + (home-page "https://www.tornadoweb.org/") + (synopsis "Python web framework and asynchronous networking library") + (description + "Tornado is a Python web framework and asynchronous networking library, +originally developed at FriendFeed. By using non-blocking network I/O, +Tornado can scale to tens of thousands of open connections, making it ideal +for long polling, WebSockets, and other applications that require a long-lived +connection to each user.") + (license license:asl2.0))) + +(define-public python-tornado-5 + (package + (inherit python-tornado) (version "5.1.1") (source (origin @@ -5387,47 +5416,10 @@ data.") "--verbose=yes"))))))) (native-inputs (list python-certifi - python-setuptools)) - (home-page "https://www.tornadoweb.org/") - (synopsis "Python web framework and asynchronous networking library") - (description - "Tornado is a Python web framework and asynchronous networking library, -originally developed at FriendFeed. By using non-blocking network I/O, -Tornado can scale to tens of thousands of open connections, making it ideal -for long polling, WebSockets, and other applications that require a long-lived -connection to each user.") - (license license:asl2.0))) + python-setuptools)))) -(define-public python-tornado-6 - (package - (name "python-tornado") - (version "6.4.2") - (source - (origin - (method url-fetch) - (uri (pypi-uri "tornado" version)) - (sha256 - (base32 "02v2mlvr58xg0l0gh08nswl53z73wkf23sziggypk63ffjsdbflj")))) - (build-system pyproject-build-system) - (arguments - (list - #:test-flags - ;; AttributeError: 'TestIOStreamWebMixin' object has no attribute 'io_loop' - #~(list "--ignore=tornado/test/iostream_test.py"))) - (native-inputs - (list python-certifi - python-pytest - python-setuptools - python-wheel)) - (home-page "https://www.tornadoweb.org/") - (synopsis "Python web framework and asynchronous networking library") - (description - "Tornado is a Python web framework and asynchronous networking library, -originally developed at FriendFeed. By using non-blocking network I/O, -Tornado can scale to tens of thousands of open connections, making it ideal -for long polling, WebSockets, and other applications that require a long-lived -connection to each user.") - (license license:asl2.0))) +;; XXX: Deprecated on <2026-01-23>. +(define-deprecated/public-alias python-tornado-6 python-tornado) (define-public python-tornado-http-auth (package diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 66c4b372751..9667f33ea42 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8847,7 +8847,7 @@ templates. A format string can be provided to control the output.") python-mako python-poetry-core python-pytest - python-tornado-6)) + python-tornado)) (propagated-inputs (list python-charset-normalizer python-six)) (home-page "https://github.com/kakulukia/pypugjs") (synopsis "Convert Pug source files into different template languages") @@ -14427,7 +14427,7 @@ away.") python-jupyter-client-bootstrap python-psutil python-pyzmq - python-tornado-6 + python-tornado python-tqdm python-traitlets)) (home-page "https://ipython.org/") @@ -18271,7 +18271,7 @@ time.") python-tinycss2 python-traitlets ;; Required, even if [serve] is not used. - python-tornado-6 + python-tornado ;; Required at runtime for `jupyter nbconvert --to=pdf`. texlive-adjustbox texlive-amsmath @@ -19794,7 +19794,7 @@ enhancements to optimization and data fitting problems.") python-pandas python-pillow python-pyyaml - python-tornado-6 + python-tornado python-xyzservices)) (native-inputs (list python-beautifulsoup4 @@ -36624,7 +36624,7 @@ well as an event scheduler.") (list python-pytest python-setuptools python-setuptools-scm - python-tornado-6 + python-tornado python-typeguard python-wheel)) (home-page "https://github.com/jd/tenacity")