Loading pkgs/development/python-modules/bokeh/default.nix +85 −50 Original line number Diff line number Diff line { buildPythonPackage { lib , stdenv , buildPythonPackage , fetchPypi , futures ? null , isPy27 , isPyPy , fetchFromGitHub , pythonOlder , substituteAll , colorama , contourpy , jinja2 , lib , mock , numpy , nodejs , packaging , pandas , pillow #, pytestCheckHook# , pytest , python-dateutil , pyyaml , selenium , six , substituteAll , tornado , typing-extensions , pytz , flaky , networkx , pytestCheckHook , pyyaml , setuptools , setuptools-git-versioning , xyzservices , beautifulsoup4 , requests , channels , click , colorcet , coverage , firefox , geckodriver , isort , json5 , nbconvert , icalendar , pandas , pythonImportsCheckHook , networkx , psutil , pygments , pygraphviz , pytest , pytest-asyncio , pytest-xdist , pytest-timeout , requests , scipy , selenium , toml , typing-extensions }: buildPythonPackage rec { pname = "bokeh"; # update together with panel which is not straightforward version = "2.4.3"; version = "3.2.2"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; hash = "sha256-7zOAEWGvN5Zlq3o0aE8iCYYeOu/VyAOiH7u5nZSHSwM="; hash = "sha256-spWbhSTWnsTniGvDZAdEXwqS4fGVMNO/xARSNqG3pv8="; }; src_test = fetchFromGitHub { owner = "bokeh"; repo = pname; rev = "refs/tags/${version}"; hash = "sha256-PK9iLOCcivr4oF9Riq73dzxGfxzWRk3bdrCCpRrTv5g="; }; patches = [ Loading @@ -48,48 +73,58 @@ buildPythonPackage rec { }) ]; disabled = isPyPy || isPy27; nativeBuildInputs = [ pythonImportsCheckHook ]; pythonImportsCheck = [ "bokeh" colorama nodejs setuptools setuptools-git-versioning ]; nativeCheckInputs = [ mock pytest pillow selenium pytz flaky networkx pytestCheckHook beautifulsoup4 requests channels click colorcet coverage firefox geckodriver isort json5 nbconvert icalendar pandas networkx psutil pygments pygraphviz pytest pytest-asyncio pytest-xdist pytest-timeout requests scipy selenium toml typing-extensions ]; propagatedBuildInputs = [ pillow jinja2 python-dateutil six pyyaml tornado contourpy numpy packaging typing-extensions ] ++ lib.optionals ( isPy27 ) [ futures pandas pillow pyyaml tornado xyzservices ]; # This test suite is a complete pain. Somehow it can't find its fixtures. doCheck = false; doCheck = false; # need more work pytestFlagsArray = "tests/test_defaults.py"; pythonImportsCheck = [ "bokeh" ]; preCheck = '' cp -rv ''${src_test}/tests/* ./tests/ ''; meta = { description = "Statistical and novel interactive HTML plots for Python"; Loading pkgs/development/python-modules/bokeh/hardcode-nodejs-npmjs-paths.patch +6 −7 Original line number Diff line number Diff line 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 + diff -ru a/src/bokeh/util/compiler.py b/src/bokeh/util/compiler.py --- a/src/bokeh/util/compiler.py +++ b/src/bokeh/util/compiler.py @@ -411,8 +411,8 @@ raise RuntimeError(f'node.js v{version_repr} or higher is needed to allow compilation of custom models ' + '("conda install nodejs" or follow https://nodejs.org/en/download/)') -_nodejs = None Loading @@ -11,5 +10,5 @@ index a752aad7d..8af05ff63 100644 +_nodejs = "@node_bin@" +_npmjs = "@npm_bin@" def _nodejs_path(): def _nodejs_path() -> str: global _nodejs Loading
pkgs/development/python-modules/bokeh/default.nix +85 −50 Original line number Diff line number Diff line { buildPythonPackage { lib , stdenv , buildPythonPackage , fetchPypi , futures ? null , isPy27 , isPyPy , fetchFromGitHub , pythonOlder , substituteAll , colorama , contourpy , jinja2 , lib , mock , numpy , nodejs , packaging , pandas , pillow #, pytestCheckHook# , pytest , python-dateutil , pyyaml , selenium , six , substituteAll , tornado , typing-extensions , pytz , flaky , networkx , pytestCheckHook , pyyaml , setuptools , setuptools-git-versioning , xyzservices , beautifulsoup4 , requests , channels , click , colorcet , coverage , firefox , geckodriver , isort , json5 , nbconvert , icalendar , pandas , pythonImportsCheckHook , networkx , psutil , pygments , pygraphviz , pytest , pytest-asyncio , pytest-xdist , pytest-timeout , requests , scipy , selenium , toml , typing-extensions }: buildPythonPackage rec { pname = "bokeh"; # update together with panel which is not straightforward version = "2.4.3"; version = "3.2.2"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; hash = "sha256-7zOAEWGvN5Zlq3o0aE8iCYYeOu/VyAOiH7u5nZSHSwM="; hash = "sha256-spWbhSTWnsTniGvDZAdEXwqS4fGVMNO/xARSNqG3pv8="; }; src_test = fetchFromGitHub { owner = "bokeh"; repo = pname; rev = "refs/tags/${version}"; hash = "sha256-PK9iLOCcivr4oF9Riq73dzxGfxzWRk3bdrCCpRrTv5g="; }; patches = [ Loading @@ -48,48 +73,58 @@ buildPythonPackage rec { }) ]; disabled = isPyPy || isPy27; nativeBuildInputs = [ pythonImportsCheckHook ]; pythonImportsCheck = [ "bokeh" colorama nodejs setuptools setuptools-git-versioning ]; nativeCheckInputs = [ mock pytest pillow selenium pytz flaky networkx pytestCheckHook beautifulsoup4 requests channels click colorcet coverage firefox geckodriver isort json5 nbconvert icalendar pandas networkx psutil pygments pygraphviz pytest pytest-asyncio pytest-xdist pytest-timeout requests scipy selenium toml typing-extensions ]; propagatedBuildInputs = [ pillow jinja2 python-dateutil six pyyaml tornado contourpy numpy packaging typing-extensions ] ++ lib.optionals ( isPy27 ) [ futures pandas pillow pyyaml tornado xyzservices ]; # This test suite is a complete pain. Somehow it can't find its fixtures. doCheck = false; doCheck = false; # need more work pytestFlagsArray = "tests/test_defaults.py"; pythonImportsCheck = [ "bokeh" ]; preCheck = '' cp -rv ''${src_test}/tests/* ./tests/ ''; meta = { description = "Statistical and novel interactive HTML plots for Python"; Loading
pkgs/development/python-modules/bokeh/hardcode-nodejs-npmjs-paths.patch +6 −7 Original line number Diff line number Diff line 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 + diff -ru a/src/bokeh/util/compiler.py b/src/bokeh/util/compiler.py --- a/src/bokeh/util/compiler.py +++ b/src/bokeh/util/compiler.py @@ -411,8 +411,8 @@ raise RuntimeError(f'node.js v{version_repr} or higher is needed to allow compilation of custom models ' + '("conda install nodejs" or follow https://nodejs.org/en/download/)') -_nodejs = None Loading @@ -11,5 +10,5 @@ index a752aad7d..8af05ff63 100644 +_nodejs = "@node_bin@" +_npmjs = "@npm_bin@" def _nodejs_path(): def _nodejs_path() -> str: global _nodejs
