Merge pull request #215508 from mweinelt/bokeh-revert

Revert "python3Packages.bokeh: 2.4.3 -> 3.0.3"; python310Packages.panels: 0.14.2 -> 0.14.3
This commit is contained in:
Robert Scott 2023-02-10 23:51:14 +00:00 committed by GitHub
commit 0b7adf1eff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 36 additions and 28 deletions

View File

@ -28,19 +28,16 @@
, icalendar
, pandas
, pythonImportsCheckHook
, contourpy
, xyzservices
}:
buildPythonPackage rec {
pname = "bokeh";
# update together with panel which is not straightforward
version = "3.0.3";
format = "setuptools";
version = "2.4.3";
src = fetchPypi {
inherit pname version;
hash= "sha256-HChHHvXmEQulvtUTE3/SYFTrxEVLx2hlDq7vxTuJioo=";
sha256 = "sha256-7zOAEWGvN5Zlq3o0aE8iCYYeOu/VyAOiH7u5nZSHSwM=";
};
patches = [
@ -73,10 +70,10 @@ buildPythonPackage rec {
requests
nbconvert
icalendar
pandas
];
propagatedBuildInputs = [
contourpy
pillow
jinja2
python-dateutil
@ -84,10 +81,8 @@ buildPythonPackage rec {
pyyaml
tornado
numpy
pandas
packaging
typing-extensions
xyzservices
]
++ lib.optionals ( isPy27 ) [
futures

View File

@ -1,9 +1,9 @@
diff --git a/src/bokeh/util/compiler.py b/src/bokeh/util/compiler.py
index 9af8691..4b93543 100644
--- a/src/bokeh/util/compiler.py
+++ b/src/bokeh/util/compiler.py
@@ -415,8 +415,8 @@ def _detect_nodejs() -> str:
raise RuntimeError(f'node.js v{version_repr} or higher is needed to allow compilation of custom models ' +
diff --git a/bokeh/util/compiler.py b/bokeh/util/compiler.py
index a752aad7d..8af05ff63 100644
--- a/bokeh/util/compiler.py
+++ b/bokeh/util/compiler.py
@@ -442,8 +442,8 @@ def _detect_nodejs():
raise RuntimeError('node.js v%s or higher is needed to allow compilation of custom models ' % version +
'("conda install nodejs" or follow https://nodejs.org/en/download/)')
-_nodejs = None
@ -11,5 +11,5 @@ index 9af8691..4b93543 100644
+_nodejs = "@node_bin@"
+_npmjs = "@npm_bin@"
def _nodejs_path() -> str:
def _nodejs_path():
global _nodejs

View File

@ -1,20 +1,22 @@
{ lib
, buildPythonPackage
, fetchPypi
, pythonRelaxDepsHook
, bleach
, bokeh
, param
, pyviz-comms
, markdown
, pyct
, testpath
, requests
, setuptools
, tqdm
, nodejs
, typing-extensions
}:
buildPythonPackage rec {
pname = "panel";
version = "0.14.2";
version = "0.14.3";
format = "wheel";
@ -23,31 +25,42 @@ buildPythonPackage rec {
# tries to fetch even more artifacts
src = fetchPypi {
inherit pname version format;
hash = "sha256-cDjrim7esGduL8IHxPpoqHB43uA78R9UMIrhNktqUdU=";
hash = "sha256-XOu17oydXwfyowYUmCKF7/RC0RQ0Uf1Ixmn+VTa85Lo=";
};
nativeBuildInputs = [
pythonRelaxDepsHook
];
pythonRelaxDeps = [
"bokeh"
];
propagatedBuildInputs = [
bleach
bokeh
param
pyviz-comms
markdown
param
pyct
testpath
pyviz-comms
requests
setuptools
tqdm
typing-extensions
];
pythonImportsCheck = [
"panel"
];
# infinite recursion in test dependencies (hvplot)
doCheck = false;
passthru = {
inherit nodejs; # For convenience
};
meta = with lib; {
description = "A high level dashboarding library for python visualization libraries";
homepage = "https://pyviz.org";
homepage = "https://github.com/holoviz/panel";
changelog = "https://github.com/holoviz/panel/releases/tag/v${version}";
license = licenses.bsd3;
maintainers = [ maintainers.costrouc ];
maintainers = with maintainers; [ costrouc ];
};
}