From 4e1dcd2c1d3f5fba7ca505130500bc4240e76d10 Mon Sep 17 00:00:00 2001 From: Bruno Alves Date: Mon, 1 Dec 2025 10:40:17 +0100 Subject: [PATCH 1/5] Add bokeh. --- pip/bokeh.file | 4 ++-- pip/requirements.txt | 1 + python_tools.spec | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pip/bokeh.file b/pip/bokeh.file index 185df9d69c7..3c22e7c469b 100644 --- a/pip/bokeh.file +++ b/pip/bokeh.file @@ -1,3 +1,3 @@ -Requires: py3-typing-extensions -Requires: py3-PyYAML py3-python-dateutil py3-Jinja2 py3-numpy py3-packaging +Requires: py3-PyYAML py3-Jinja2 py3-numpy py3-packaging Requires: py3-tornado py3-numpy py3-pillow +Requires: py3-contourpy, py3-pandas, py3-xyzservices, py3-narwhals \ No newline at end of file diff --git a/pip/requirements.txt b/pip/requirements.txt index f83761a01fc..318671fc30c 100644 --- a/pip/requirements.txt +++ b/pip/requirements.txt @@ -228,6 +228,7 @@ MarkupSafe==3.0.3 # NO_AUTO_UPDATE: version >= 3.10.0 requires Python 3.10+ matplotlib==3.9.4 matplotlib-inline==0.2.1 +bokeh=3.8.1 maturin==1.9.6 mccabe==0.7.0 mdurl==0.1.2 diff --git a/python_tools.spec b/python_tools.spec index 933a2b27af2..99e3df73e4d 100644 --- a/python_tools.spec +++ b/python_tools.spec @@ -110,6 +110,7 @@ Requires: py3-python-ldap Requires: py3-plac Requires: py3-matplotlib +Requires: py3-bokeh Requires: py3-numpy Requires: py3-sqlalchemy Requires: py3-pygithub From a7ffea921854458207c235dcc19ae185b0944ae2 Mon Sep 17 00:00:00 2001 From: Bruno Alves Date: Mon, 1 Dec 2025 21:14:30 +0100 Subject: [PATCH 2/5] Remove package duplication. --- pip/requirements.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pip/requirements.txt b/pip/requirements.txt index 318671fc30c..6a185f4fda4 100644 --- a/pip/requirements.txt +++ b/pip/requirements.txt @@ -49,7 +49,7 @@ bleach==6.2.0 blosc==1.11.3 # NO_AUTO_UPDATE: version >= 2.6.0 needs Python 3.10 blosc2==2.5.1 -bokeh==3.8.0 +bokeh==3.8.1 boost-histogram==1.6.1 bottle==0.13.4 # NO_AUTO_UPDATE: version >= 16.0 needs Python 3.10 @@ -228,7 +228,6 @@ MarkupSafe==3.0.3 # NO_AUTO_UPDATE: version >= 3.10.0 requires Python 3.10+ matplotlib==3.9.4 matplotlib-inline==0.2.1 -bokeh=3.8.1 maturin==1.9.6 mccabe==0.7.0 mdurl==0.1.2 From 4e7082da0f238769d8bcdea8980b4f191a66ed89 Mon Sep 17 00:00:00 2001 From: Bruno Alves Date: Mon, 1 Dec 2025 23:33:17 +0100 Subject: [PATCH 3/5] Remove commas. --- pip/bokeh.file | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip/bokeh.file b/pip/bokeh.file index 3c22e7c469b..2b60fc29303 100644 --- a/pip/bokeh.file +++ b/pip/bokeh.file @@ -1,3 +1,3 @@ Requires: py3-PyYAML py3-Jinja2 py3-numpy py3-packaging Requires: py3-tornado py3-numpy py3-pillow -Requires: py3-contourpy, py3-pandas, py3-xyzservices, py3-narwhals \ No newline at end of file +Requires: py3-contourpy py3-pandas py3-xyzservices py3-narwhals \ No newline at end of file From 5eebe41ab5ebaf66c8629b957b3f689d32405f10 Mon Sep 17 00:00:00 2001 From: Bruno Alves Date: Tue, 2 Dec 2025 10:56:58 +0100 Subject: [PATCH 4/5] Add xyzservices and narwhals dependencies of bokeh. --- pip/requirements.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pip/requirements.txt b/pip/requirements.txt index 6a185f4fda4..285c4b9f38a 100644 --- a/pip/requirements.txt +++ b/pip/requirements.txt @@ -243,6 +243,7 @@ mplhep-data==0.0.5 mpmath==1.3.0 msgpack==1.1.2 multidict==6.7.0 +narwhals==2.13.0 nbclassic==1.3.3 nbclient==0.10.2 nbconvert==7.16.6 @@ -461,6 +462,7 @@ wrapt==1.14.1 #NO_AUTO_UPDATE: New versions require nvidia-nccl-cu12, which is a binary .whl package xgboost==1.7.5 xxhash==3.6.0 +xyzservices==2025.11.0 yarl==1.22.0 zipp==3.23.0 iminuit==2.31.1 From 87a9c581855b714ec55e6870e046a9aded9fff22 Mon Sep 17 00:00:00 2001 From: Bruno Alves Date: Tue, 2 Dec 2025 14:11:36 +0100 Subject: [PATCH 5/5] Add narwhals dependency. --- pip/narwhals.file | 1 + 1 file changed, 1 insertion(+) create mode 100644 pip/narwhals.file diff --git a/pip/narwhals.file b/pip/narwhals.file new file mode 100644 index 00000000000..1d4a1de2e99 --- /dev/null +++ b/pip/narwhals.file @@ -0,0 +1 @@ +BuildRequires: py3-hatchling \ No newline at end of file