nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge pull request #252993 from veprbl/pr/bokeh_3_2_2

python3.pkgs.bokeh: 2.4.3 -> 3.2.2

authored by

Dmitry Kalinkin and committed by
GitHub
597ed0c5 2941ef94

+104 -71
+88 -53
pkgs/development/python-modules/bokeh/default.nix
··· 1 - { buildPythonPackage 1 + { lib 2 + , stdenv 3 + , buildPythonPackage 2 4 , fetchPypi 3 - , futures ? null 4 - , isPy27 5 - , isPyPy 5 + , fetchFromGitHub 6 + , pythonOlder 7 + , substituteAll 8 + , colorama 9 + , contourpy 6 10 , jinja2 7 - , lib 8 11 , mock 9 12 , numpy 10 13 , nodejs 11 14 , 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 15 , pandas 30 - , pythonImportsCheckHook 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 31 46 }: 32 47 33 48 buildPythonPackage rec { 34 49 pname = "bokeh"; 35 50 # update together with panel which is not straightforward 36 - version = "2.4.3"; 51 + version = "3.2.2"; 52 + format = "pyproject"; 53 + 54 + disabled = pythonOlder "3.9"; 37 55 38 56 src = fetchPypi { 39 57 inherit pname version; 40 - hash = "sha256-7zOAEWGvN5Zlq3o0aE8iCYYeOu/VyAOiH7u5nZSHSwM="; 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="; 41 66 }; 42 67 43 68 patches = [ ··· 73 48 }) 74 49 ]; 75 50 76 - disabled = isPyPy || isPy27; 77 - 78 51 nativeBuildInputs = [ 79 - pythonImportsCheckHook 80 - ]; 81 - 82 - pythonImportsCheck = [ 83 - "bokeh" 52 + colorama 53 + nodejs 54 + setuptools 55 + setuptools-git-versioning 84 56 ]; 85 57 86 58 nativeCheckInputs = [ 87 - mock 88 - pytest 89 - pillow 90 - selenium 91 - pytz 92 - flaky 93 - networkx 59 + pytestCheckHook 94 60 beautifulsoup4 95 - requests 61 + channels 62 + click 63 + colorcet 64 + coverage 65 + firefox 66 + geckodriver 67 + isort 68 + json5 96 69 nbconvert 97 - icalendar 98 - pandas 70 + networkx 71 + psutil 72 + pygments 73 + pygraphviz 74 + pytest 75 + pytest-asyncio 76 + pytest-xdist 77 + pytest-timeout 78 + requests 79 + scipy 80 + selenium 81 + toml 82 + typing-extensions 99 83 ]; 100 84 101 85 propagatedBuildInputs = [ 102 - pillow 103 86 jinja2 104 - python-dateutil 105 - six 106 - pyyaml 107 - tornado 87 + contourpy 108 88 numpy 109 89 packaging 110 - typing-extensions 111 - ] 112 - ++ lib.optionals ( isPy27 ) [ 113 - futures 90 + pandas 91 + pillow 92 + pyyaml 93 + tornado 94 + xyzservices 114 95 ]; 115 96 116 - # This test suite is a complete pain. Somehow it can't find its fixtures. 117 - doCheck = false; 97 + doCheck = false; # need more work 98 + pytestFlagsArray = "tests/test_defaults.py"; 99 + pythonImportsCheck = [ "bokeh" ]; 100 + preCheck = '' 101 + cp -rv ''${src_test}/tests/* ./tests/ 102 + ''; 118 103 119 104 meta = { 120 105 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 + 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 ' + 7 6 '("conda install nodejs" or follow https://nodejs.org/en/download/)') 8 7 9 8 -_nodejs = None ··· 10 11 +_nodejs = "@node_bin@" 11 12 +_npmjs = "@npm_bin@" 12 13 13 - def _nodejs_path(): 14 + def _nodejs_path() -> str: 14 15 global _nodejs
+6 -4
pkgs/development/python-modules/intake/default.nix
··· 26 26 27 27 buildPythonPackage rec { 28 28 pname = "intake"; 29 - version = "0.7.0"; 29 + version = "unstable-2023-08-24"; 30 30 format = "setuptools"; 31 31 32 32 disabled = pythonOlder "3.7"; ··· 34 34 src = fetchFromGitHub { 35 35 owner = pname; 36 36 repo = pname; 37 - rev = "refs/tags/${version}"; 38 - hash = "sha256-2LUblA8eVCOfVJ6BJayralNiv6EFt6MzR5ptKksVNA4="; 37 + rev = "81b1567a2030adfb22b856b4f63cefe35de68983"; 38 + hash = "sha256-S2PoUN0Bao5VULfHhgbXXowopPLm/njAHO3dIM8ILno="; 39 39 }; 40 40 41 41 propagatedBuildInputs = [ ··· 79 79 --replace "'pytest-runner'" "" 80 80 ''; 81 81 82 + __darwinAllowLocalNetworking = true; 83 + 82 84 preCheck = '' 83 85 export HOME=$(mktemp -d); 84 86 export PATH="$PATH:$out/bin"; ··· 108 106 "test_ndarray" 109 107 "test_python" 110 108 # Timing-based, flaky on darwin and possibly others 111 - "TestServerV1Source.test_idle_timer" 109 + "test_idle_timer" 112 110 # arrow-cpp-13 related 113 111 "test_read" 114 112 "test_pickle"
+2 -5
pkgs/development/python-modules/livelossplot/default.nix
··· 13 13 14 14 buildPythonPackage rec { 15 15 pname = "livelossplot"; 16 - version = "0.5.4"; 16 + version = "0.5.5"; 17 17 18 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 19 23 20 src = fetchFromGitHub { 24 21 owner = "stared"; 25 22 repo = pname; 26 23 rev = "v${version}"; 27 - sha256 = "IV6YAidoqVoKvpy+LNNHTPpobiDoGX59bHqJcBtaydk="; 24 + sha256 = "sha256-YU8vX4SubI6txmC/i5fOjcvWfuDFm8+SPmie8Eb1qRs="; 28 25 }; 29 26 30 27 propagatedBuildInputs = [ bokeh ipython matplotlib numpy ];
+2 -2
pkgs/development/python-modules/panel/default.nix
··· 16 16 17 17 buildPythonPackage rec { 18 18 pname = "panel"; 19 - version = "0.14.4"; 19 + version = "1.2.2"; 20 20 21 21 format = "wheel"; 22 22 ··· 25 25 # tries to fetch even more artifacts 26 26 src = fetchPypi { 27 27 inherit pname version format; 28 - hash = "sha256-3U/PL8cnbNPw3xEM56YZesQEDXTE79yMCSsjdxwfUU0="; 28 + hash = "sha256-RMRjxcUp6MTs001wdNfC/e6diOcgtqrSaVIOSQfPgTs="; 29 29 }; 30 30 31 31 nativeBuildInputs = [