diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index ffeff510fb61..c2eec531c728 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -5,8 +5,7 @@ fetchFromGitHub, # build-system - jupyter-packaging, - setuptools, + hatchling, # dependencies narwhals, @@ -38,31 +37,23 @@ buildPythonPackage (finalAttrs: { pname = "plotly"; - version = "6.6.0"; + version = "6.7.0"; pyproject = true; src = fetchFromGitHub { owner = "plotly"; repo = "plotly.py"; tag = "v${finalAttrs.version}"; - hash = "sha256-t1IYu3PL/B71fhX5LVQrjAKkQSjPC+wZjMnBp4kPTNY="; + hash = "sha256-gykhl1aBgKCkJVv507UJk4xdYaruV/aU+JLYmvyFYbY="; }; patches = [ - # https://numpy.org/devdocs/release/2.4.0-notes.html#removed-interpolation-parameter-from-quantile-and-percentile-functions - # Upstream PR: https://github.com/plotly/plotly.py/pull/5505 - ./numpy-2.4-percentile-interpolation.patch - # https://numpy.org/devdocs/release/2.4.0-notes.html#removed-numpy-in1d # Upstream PR: https://github.com/plotly/plotly.py/pull/5522 ./numpy-2.4-in1d.patch ]; postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail '"hatch", ' "" \ - --replace-fail "jupyter_packaging~=0.10.0" jupyter_packaging - # `pytest_ignore_collect` takes only `collection_path` starting with # pytest 9. Most of the paths referenced in `plotly/conftest.py` # don't exist anymore and wouldn't be collected anyway, so we can just @@ -75,8 +66,7 @@ buildPythonPackage (finalAttrs: { env.SKIP_NPM = true; build-system = [ - setuptools - jupyter-packaging + hatchling ]; dependencies = [ diff --git a/pkgs/development/python-modules/plotly/numpy-2.4-percentile-interpolation.patch b/pkgs/development/python-modules/plotly/numpy-2.4-percentile-interpolation.patch deleted file mode 100644 index d5d945e473a4..000000000000 --- a/pkgs/development/python-modules/plotly/numpy-2.4-percentile-interpolation.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/plotly/figure_factory/_violin.py b/plotly/figure_factory/_violin.py -index 55924e692..e89db0e11 100644 ---- a/plotly/figure_factory/_violin.py -+++ b/plotly/figure_factory/_violin.py -@@ -17,9 +17,9 @@ def calc_stats(data): - x = np.asarray(data, float) - vals_min = np.min(x) - vals_max = np.max(x) -- q2 = np.percentile(x, 50, interpolation="linear") -- q1 = np.percentile(x, 25, interpolation="lower") -- q3 = np.percentile(x, 75, interpolation="higher") -+ q2 = np.percentile(x, 50, method="linear") -+ q1 = np.percentile(x, 25, method="lower") -+ q3 = np.percentile(x, 75, method="higher") - iqr = q3 - q1 - whisker_dist = 1.5 * iqr -