From 244fe29c7caebbde949e9427f282e0d44a946842 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Mon, 30 Jun 2025 10:10:34 -0700 Subject: [PATCH 1/4] python3Packages.plotly: 6.1.2 -> 6.2.0 Version bump, configure gitUpdater with the proper version prefix. changelog: https://github.com/plotly/plotly.py/releases/tag/v6.2.0 diff: https://github.com/plotly/plotly.py/compare/v6.1.2...v6.2.0 --- .../python-modules/plotly/default.nix | 53 +++++++++++-------- 1 file changed, 30 insertions(+), 23 deletions(-) diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index a8726a155b689..52a9c334316b1 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -38,14 +38,14 @@ buildPythonPackage rec { pname = "plotly"; - version = "6.1.2"; + version = "6.2.0"; pyproject = true; src = fetchFromGitHub { owner = "plotly"; repo = "plotly.py"; tag = "v${version}"; - hash = "sha256-+vIq//pDLaaTmRGW+oytho3TfMmLCtuIoHeFenLVcek="; + hash = "sha256-Vfj5jG0AkBjivExOx7oMoocTopWl0yMc1INpEbtlgTc="; }; postPatch = '' @@ -105,27 +105,34 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; - disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ - # fails to launch kaleido subprocess - "tests/test_optional/test_kaleido" - # numpy2 related error, RecursionError - # See: https://github.com/plotly/plotly.py/issues/4852 - "tests/test_plotly_utils/validators/test_angle_validator.py" - "tests/test_plotly_utils/validators/test_any_validator.py" - "tests/test_plotly_utils/validators/test_color_validator.py" - "tests/test_plotly_utils/validators/test_colorlist_validator.py" - "tests/test_plotly_utils/validators/test_colorscale_validator.py" - "tests/test_plotly_utils/validators/test_dataarray_validator.py" - "tests/test_plotly_utils/validators/test_enumerated_validator.py" - "tests/test_plotly_utils/validators/test_fig_deepcopy.py" - "tests/test_plotly_utils/validators/test_flaglist_validator.py" - "tests/test_plotly_utils/validators/test_infoarray_validator.py" - "tests/test_plotly_utils/validators/test_integer_validator.py" - "tests/test_plotly_utils/validators/test_number_validator.py" - "tests/test_plotly_utils/validators/test_pandas_series_input.py" - "tests/test_plotly_utils/validators/test_string_validator.py" - "tests/test_plotly_utils/validators/test_xarray_input.py" - ]; + disabledTestPaths = + [ + # Broken imports + "plotly/matplotlylib/mplexporter/tests" + # Fails to catch error when serializing document + "tests/test_optional/test_kaleido/test_kaleido.py::test_defaults" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # fails to launch kaleido subprocess + "tests/test_optional/test_kaleido" + # numpy2 related error, RecursionError + # See: https://github.com/plotly/plotly.py/issues/4852 + "tests/test_plotly_utils/validators/test_angle_validator.py" + "tests/test_plotly_utils/validators/test_any_validator.py" + "tests/test_plotly_utils/validators/test_color_validator.py" + "tests/test_plotly_utils/validators/test_colorlist_validator.py" + "tests/test_plotly_utils/validators/test_colorscale_validator.py" + "tests/test_plotly_utils/validators/test_dataarray_validator.py" + "tests/test_plotly_utils/validators/test_enumerated_validator.py" + "tests/test_plotly_utils/validators/test_fig_deepcopy.py" + "tests/test_plotly_utils/validators/test_flaglist_validator.py" + "tests/test_plotly_utils/validators/test_infoarray_validator.py" + "tests/test_plotly_utils/validators/test_integer_validator.py" + "tests/test_plotly_utils/validators/test_number_validator.py" + "tests/test_plotly_utils/validators/test_pandas_series_input.py" + "tests/test_plotly_utils/validators/test_string_validator.py" + "tests/test_plotly_utils/validators/test_xarray_input.py" + ]; pythonImportsCheck = [ "plotly" ]; From 10634a32d75fc9b03884c3d5e219eabec0ba7f0b Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Mon, 30 Jun 2025 09:50:11 -0700 Subject: [PATCH 2/4] python3Packages.chart-studio: 1.1.0-unstable-2024-07-23 -> 1.1.0-unstable-2025-01-30 Switch to new dedicated repository, move ref to current HEAD, fix homepage link. --- .../python-modules/chart-studio/default.nix | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/chart-studio/default.nix b/pkgs/development/python-modules/chart-studio/default.nix index b850ed89301e0..f3659c2112509 100644 --- a/pkgs/development/python-modules/chart-studio/default.nix +++ b/pkgs/development/python-modules/chart-studio/default.nix @@ -10,22 +10,18 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage { pname = "chart-studio"; - version = "1.1.0-unstable-2024-07-23"; + version = "1.1.0-unstable-2025-01-30"; pyproject = true; - # chart-studio was split from plotly src = fetchFromGitHub { owner = "plotly"; - repo = "plotly.py"; - # We use plotly's upstream version as it's the same repo, but chart studio has its own version number. - rev = "v5.23.0"; - hash = "sha256-K1hEs00AGBCe2fgytyPNWqE5M0jU5ESTzynP55kc05Y="; + repo = "chart-studio"; + rev = "44c7c43be0fe7e031ec281c86ee7dae0efa0619e"; + hash = "sha256-RekcZzUcunIqXOSriW+RvpLdvATQWTeRAiR8LFodfQg="; }; - sourceRoot = "${src.name}/packages/python/chart-studio"; - build-system = [ setuptools ]; dependencies = [ @@ -36,6 +32,7 @@ buildPythonPackage rec { nativeCheckInputs = [ mock + plotly pytestCheckHook ]; @@ -46,12 +43,11 @@ buildPythonPackage rec { # most tests talk to a network service, so only run ones that don't do that. pytestFlagsArray = [ "chart_studio/tests/test_core" - "chart_studio/tests/test_plot_ly/test_api" ]; meta = { description = "Utilities for interfacing with Plotly's Chart Studio service"; - homepage = "https://github.com/plotly/plotly.py/tree/master/packages/python/chart-studio"; + homepage = "https://github.com/plotly/chart-studio"; license = with lib.licenses; [ mit ]; maintainers = [ ]; }; From 7d913af5abb6c54873d718c5564786397e248bc7 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Tue, 1 Jul 2025 09:08:40 -0700 Subject: [PATCH 3/4] python3Packages.plotly: add sarahec as maintainer --- pkgs/development/python-modules/plotly/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index 52a9c334316b1..26690081fed9b 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -142,6 +142,9 @@ buildPythonPackage rec { downloadPage = "https://github.com/plotly/plotly.py"; changelog = "https://github.com/plotly/plotly.py/blob/master/CHANGELOG.md"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ pandapip1 ]; + maintainers = with lib.maintainers; [ + pandapip1 + sarahec + ]; }; } From 40a534d45b18a1878df279300a7eda71ed7e978b Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Tue, 1 Jul 2025 09:09:38 -0700 Subject: [PATCH 4/4] python3Packages.chart-studio: add sarahec as maintainer --- pkgs/development/python-modules/chart-studio/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/chart-studio/default.nix b/pkgs/development/python-modules/chart-studio/default.nix index f3659c2112509..123e472ea7b1d 100644 --- a/pkgs/development/python-modules/chart-studio/default.nix +++ b/pkgs/development/python-modules/chart-studio/default.nix @@ -49,6 +49,6 @@ buildPythonPackage { description = "Utilities for interfacing with Plotly's Chart Studio service"; homepage = "https://github.com/plotly/chart-studio"; license = with lib.licenses; [ mit ]; - maintainers = [ ]; + maintainers = with lib.maintainers; [ sarahec ]; }; }