commit 597ed0c552bb13bd6cc53bf2e8917e180eae3879 · pyrox.dev/nixpkgs

+85 -50

pkgs/development/python-modules/bokeh/default.nix

··· 1 - { buildPythonPackage 2 , fetchPypi 3 - , futures ? null 4 - , isPy27 5 - , isPyPy 6 , jinja2 7 - , lib 8 , mock 9 , numpy 10 , nodejs 11 , packaging 12 , pillow 13 - #, pytestCheckHook# 14 - , pytest 15 - , python-dateutil 16 , pyyaml 17 - , selenium 18 - , six 19 - , substituteAll 20 - , tornado 21 - , typing-extensions 22 - , pytz 23 - , flaky 24 - , networkx 25 , beautifulsoup4 26 - , requests 27 , nbconvert 28 - , icalendar 29 - , pandas 30 - , pythonImportsCheckHook 31 }: 32 33 buildPythonPackage rec { 34 pname = "bokeh"; 35 # update together with panel which is not straightforward 36 - version = "2.4.3"; 37 38 src = fetchPypi { 39 inherit pname version; 40 - hash = "sha256-7zOAEWGvN5Zlq3o0aE8iCYYeOu/VyAOiH7u5nZSHSwM="; 41 }; 42 43 patches = [ ··· 48 }) 49 ]; 50 51 - disabled = isPyPy || isPy27; 52 - 53 nativeBuildInputs = [ 54 - pythonImportsCheckHook 55 - ]; 56 - 57 - pythonImportsCheck = [ 58 - "bokeh" 59 ]; 60 61 nativeCheckInputs = [ 62 - mock 63 pytest 64 - pillow 65 selenium 66 - pytz 67 - flaky 68 - networkx 69 - beautifulsoup4 70 - requests 71 - nbconvert 72 - icalendar 73 - pandas 74 ]; 75 76 propagatedBuildInputs = [ 77 - pillow 78 jinja2 79 - python-dateutil 80 - six 81 pyyaml 82 tornado 83 - numpy 84 - packaging 85 - typing-extensions 86 - ] 87 - ++ lib.optionals ( isPy27 ) [ 88 - futures 89 ]; 90 91 - # This test suite is a complete pain. Somehow it can't find its fixtures. 92 - doCheck = false; 93 94 meta = { 95 description = "Statistical and novel interactive HTML plots for Python";

··· 1 + { lib 2 + , stdenv 3 + , buildPythonPackage 4 , fetchPypi 5 + , fetchFromGitHub 6 + , pythonOlder 7 + , substituteAll 8 + , colorama 9 + , contourpy 10 , jinja2 11 , mock 12 , numpy 13 , nodejs 14 , packaging 15 + , pandas 16 , pillow 17 + , tornado 18 + , pytestCheckHook 19 , pyyaml 20 + , setuptools 21 + , setuptools-git-versioning 22 + , xyzservices 23 , beautifulsoup4 24 + , channels 25 + , click 26 + , colorcet 27 + , coverage 28 + , firefox 29 + , geckodriver 30 + , isort 31 + , json5 32 , nbconvert 33 + , networkx 34 + , psutil 35 + , pygments 36 + , pygraphviz 37 + , pytest 38 + , pytest-asyncio 39 + , pytest-xdist 40 + , pytest-timeout 41 + , requests 42 + , scipy 43 + , selenium 44 + , toml 45 + , typing-extensions 46 }: 47 48 buildPythonPackage rec { 49 pname = "bokeh"; 50 # update together with panel which is not straightforward 51 + version = "3.2.2"; 52 + format = "pyproject"; 53 + 54 + disabled = pythonOlder "3.9"; 55 56 src = fetchPypi { 57 inherit pname version; 58 + hash = "sha256-spWbhSTWnsTniGvDZAdEXwqS4fGVMNO/xARSNqG3pv8="; 59 + }; 60 + 61 + src_test = fetchFromGitHub { 62 + owner = "bokeh"; 63 + repo = pname; 64 + rev = "refs/tags/${version}"; 65 + hash = "sha256-PK9iLOCcivr4oF9Riq73dzxGfxzWRk3bdrCCpRrTv5g="; 66 }; 67 68 patches = [ ··· 73 }) 74 ]; 75 76 nativeBuildInputs = [ 77 + colorama 78 + nodejs 79 + setuptools 80 + setuptools-git-versioning 81 ]; 82 83 nativeCheckInputs = [ 84 + pytestCheckHook 85 + beautifulsoup4 86 + channels 87 + click 88 + colorcet 89 + coverage 90 + firefox 91 + geckodriver 92 + isort 93 + json5 94 + nbconvert 95 + networkx 96 + psutil 97 + pygments 98 + pygraphviz 99 pytest 100 + pytest-asyncio 101 + pytest-xdist 102 + pytest-timeout 103 + requests 104 + scipy 105 selenium 106 + toml 107 + typing-extensions 108 ]; 109 110 propagatedBuildInputs = [ 111 jinja2 112 + contourpy 113 + numpy 114 + packaging 115 + pandas 116 + pillow 117 pyyaml 118 tornado 119 + xyzservices 120 ]; 121 122 + doCheck = false; # need more work 123 + pytestFlagsArray = "tests/test_defaults.py"; 124 + pythonImportsCheck = [ "bokeh" ]; 125 + preCheck = '' 126 + cp -rv ''${src_test}/tests/* ./tests/ 127 + ''; 128 129 meta = { 130 description = "Statistical and novel interactive HTML plots for Python";

+6 -7

pkgs/development/python-modules/bokeh/hardcode-nodejs-npmjs-paths.patch

··· 1 - diff --git a/bokeh/util/compiler.py b/bokeh/util/compiler.py 2 - index a752aad7d..8af05ff63 100644 3 - --- a/bokeh/util/compiler.py 4 - +++ b/bokeh/util/compiler.py 5 - @@ -442,8 +442,8 @@ def _detect_nodejs(): 6 - raise RuntimeError('node.js v%s or higher is needed to allow compilation of custom models ' % version + 7 '("conda install nodejs" or follow https://nodejs.org/en/download/)') 8 9 -_nodejs = None ··· 11 +_nodejs = "@node_bin@" 12 +_npmjs = "@npm_bin@" 13 14 - def _nodejs_path(): 15 global _nodejs

··· 1 + diff -ru a/src/bokeh/util/compiler.py b/src/bokeh/util/compiler.py 2 + --- a/src/bokeh/util/compiler.py 3 + +++ b/src/bokeh/util/compiler.py 4 + @@ -411,8 +411,8 @@ 5 + raise RuntimeError(f'node.js v{version_repr} or higher is needed to allow compilation of custom models ' + 6 '("conda install nodejs" or follow https://nodejs.org/en/download/)') 7 8 -_nodejs = None ··· 10 +_nodejs = "@node_bin@" 11 +_npmjs = "@npm_bin@" 12 13 + def _nodejs_path() -> str: 14 global _nodejs

+6 -4

pkgs/development/python-modules/intake/default.nix

··· 26 27 buildPythonPackage rec { 28 pname = "intake"; 29 - version = "0.7.0"; 30 format = "setuptools"; 31 32 disabled = pythonOlder "3.7"; ··· 34 src = fetchFromGitHub { 35 owner = pname; 36 repo = pname; 37 - rev = "refs/tags/${version}"; 38 - hash = "sha256-2LUblA8eVCOfVJ6BJayralNiv6EFt6MzR5ptKksVNA4="; 39 }; 40 41 propagatedBuildInputs = [ ··· 79 --replace "'pytest-runner'" "" 80 ''; 81 82 preCheck = '' 83 export HOME=$(mktemp -d); 84 export PATH="$PATH:$out/bin"; ··· 106 "test_ndarray" 107 "test_python" 108 # Timing-based, flaky on darwin and possibly others 109 - "TestServerV1Source.test_idle_timer" 110 # arrow-cpp-13 related 111 "test_read" 112 "test_pickle"

··· 26 27 buildPythonPackage rec { 28 pname = "intake"; 29 + version = "unstable-2023-08-24"; 30 format = "setuptools"; 31 32 disabled = pythonOlder "3.7"; ··· 34 src = fetchFromGitHub { 35 owner = pname; 36 repo = pname; 37 + rev = "81b1567a2030adfb22b856b4f63cefe35de68983"; 38 + hash = "sha256-S2PoUN0Bao5VULfHhgbXXowopPLm/njAHO3dIM8ILno="; 39 }; 40 41 propagatedBuildInputs = [ ··· 79 --replace "'pytest-runner'" "" 80 ''; 81 82 + __darwinAllowLocalNetworking = true; 83 + 84 preCheck = '' 85 export HOME=$(mktemp -d); 86 export PATH="$PATH:$out/bin"; ··· 108 "test_ndarray" 109 "test_python" 110 # Timing-based, flaky on darwin and possibly others 111 + "test_idle_timer" 112 # arrow-cpp-13 related 113 "test_read" 114 "test_pickle"

+2 -5

pkgs/development/python-modules/livelossplot/default.nix

··· 13 14 buildPythonPackage rec { 15 pname = "livelossplot"; 16 - version = "0.5.4"; 17 18 disabled = pythonOlder "3.6"; 19 20 - # version number in source is wrong in this release 21 - postPatch = ''substituteInPlace ${pname}/version.py --replace "0.5.3" "0.5.4"''; 22 - 23 src = fetchFromGitHub { 24 owner = "stared"; 25 repo = pname; 26 rev = "v${version}"; 27 - sha256 = "IV6YAidoqVoKvpy+LNNHTPpobiDoGX59bHqJcBtaydk="; 28 }; 29 30 propagatedBuildInputs = [ bokeh ipython matplotlib numpy ];

··· 13 14 buildPythonPackage rec { 15 pname = "livelossplot"; 16 + version = "0.5.5"; 17 18 disabled = pythonOlder "3.6"; 19 20 src = fetchFromGitHub { 21 owner = "stared"; 22 repo = pname; 23 rev = "v${version}"; 24 + sha256 = "sha256-YU8vX4SubI6txmC/i5fOjcvWfuDFm8+SPmie8Eb1qRs="; 25 }; 26 27 propagatedBuildInputs = [ bokeh ipython matplotlib numpy ];

+2 -2

pkgs/development/python-modules/panel/default.nix

··· 16 17 buildPythonPackage rec { 18 pname = "panel"; 19 - version = "0.14.4"; 20 21 format = "wheel"; 22 ··· 25 # tries to fetch even more artifacts 26 src = fetchPypi { 27 inherit pname version format; 28 - hash = "sha256-3U/PL8cnbNPw3xEM56YZesQEDXTE79yMCSsjdxwfUU0="; 29 }; 30 31 nativeBuildInputs = [

··· 16 17 buildPythonPackage rec { 18 pname = "panel"; 19 + version = "1.2.2"; 20 21 format = "wheel"; 22 ··· 25 # tries to fetch even more artifacts 26 src = fetchPypi { 27 inherit pname version format; 28 + hash = "sha256-RMRjxcUp6MTs001wdNfC/e6diOcgtqrSaVIOSQfPgTs="; 29 }; 30 31 nativeBuildInputs = [