Unverified Commit 597ed0c5 authored by Dmitry Kalinkin's avatar Dmitry Kalinkin Committed by GitHub
Browse files

Merge pull request #252993 from veprbl/pr/bokeh_3_2_2 

python3.pkgs.bokeh: 2.4.3 -> 3.2.2
parents 2941ef94 33e5abf1

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 = [
@@ -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";

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
@@ -11,5 +10,5 @@ index a752aad7d..8af05ff63 100644 
+_nodejs = "@node_bin@"

+_npmjs = "@npm_bin@"

 

 def _nodejs_path():

 def _nodejs_path() -> str:

     global _nodejs

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

+6 −4
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 


buildPythonPackage rec {

  pname = "intake";

  version = "0.7.0";

  version = "unstable-2023-08-24";

  format = "setuptools";



  disabled = pythonOlder "3.7";
@@ -34,8 +34,8 @@ buildPythonPackage rec { 
  src = fetchFromGitHub {

    owner = pname;

    repo = pname;

    rev = "refs/tags/${version}";

    hash = "sha256-2LUblA8eVCOfVJ6BJayralNiv6EFt6MzR5ptKksVNA4=";

    rev = "81b1567a2030adfb22b856b4f63cefe35de68983";

    hash = "sha256-S2PoUN0Bao5VULfHhgbXXowopPLm/njAHO3dIM8ILno=";

  };



  propagatedBuildInputs = [
@@ -79,6 +79,8 @@ buildPythonPackage rec { 
      --replace "'pytest-runner'" ""

  '';



  __darwinAllowLocalNetworking = true;



  preCheck = ''

    export HOME=$(mktemp -d);

    export PATH="$PATH:$out/bin";
@@ -106,7 +108,7 @@ buildPythonPackage rec { 
    "test_ndarray"

    "test_python"

    # Timing-based, flaky on darwin and possibly others

    "TestServerV1Source.test_idle_timer"

    "test_idle_timer"

    # arrow-cpp-13 related

    "test_read"

    "test_pickle"

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

+2 −5
Original line number Diff line number Diff line
@@ -13,18 +13,15 @@ 


buildPythonPackage rec {

  pname = "livelossplot";

  version = "0.5.4";

  version = "0.5.5";



  disabled = pythonOlder "3.6";



  # version number in source is wrong in this release

  postPatch = ''substituteInPlace ${pname}/version.py --replace "0.5.3" "0.5.4"'';



  src = fetchFromGitHub {

    owner  = "stared";

    repo   = pname;

    rev    = "v${version}";

    sha256 = "IV6YAidoqVoKvpy+LNNHTPpobiDoGX59bHqJcBtaydk=";

    sha256 = "sha256-YU8vX4SubI6txmC/i5fOjcvWfuDFm8+SPmie8Eb1qRs=";

  };



  propagatedBuildInputs = [ bokeh ipython matplotlib numpy ];

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

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


buildPythonPackage rec {

  pname = "panel";

  version = "0.14.4";

  version = "1.2.2";



  format = "wheel";
@@ -25,7 +25,7 @@ buildPythonPackage rec { 
  # tries to fetch even more artifacts

  src = fetchPypi {

    inherit pname version format;

    hash = "sha256-3U/PL8cnbNPw3xEM56YZesQEDXTE79yMCSsjdxwfUU0=";

    hash = "sha256-RMRjxcUp6MTs001wdNfC/e6diOcgtqrSaVIOSQfPgTs=";

  };



  nativeBuildInputs = [