Revert "python3Packages.bokeh: 2.4.3 -> 3.0.3"
This reverts commit 1ac65c004e
.
Reverse dependencies are not ready yet, breaks panel and multiple other
packages.
This commit is contained in:
parent
ecfbe53246
commit
9c35e69c84
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user