From 7fcae89d1c5e0f51d1b18564d443658acec56f19 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 26 Jul 2022 04:20:00 +0000 Subject: [PATCH 1/2] python310Packages.wandb: fix build --- .../python-modules/wandb/default.nix | 73 ++++++++++--------- .../wandb/hardcode-git-path.patch | 6 +- 2 files changed, 41 insertions(+), 38 deletions(-) diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix index 586463dbaa88..534b1cdba4f8 100644 --- a/pkgs/development/python-modules/wandb/default.nix +++ b/pkgs/development/python-modules/wandb/default.nix @@ -101,47 +101,50 @@ buildPythonPackage rec { disabledTestPaths = [ # Tests that try to get chatty over sockets or spin up servers, not possible in the nix build environment. - "tests/integrations/test_keras.py" - "tests/integrations/test_torch.py" - "tests/test_cli.py" - "tests/test_data_types.py" - "tests/test_file_stream.py" - "tests/test_file_upload.py" - "tests/test_footer.py" - "tests/test_internal_api.py" - "tests/test_label_full.py" - "tests/test_login.py" - "tests/test_meta.py" - "tests/test_metric_full.py" - "tests/test_metric_internal.py" - "tests/test_mode_disabled.py" - "tests/test_model_workflows.py" - "tests/test_mp_full.py" - "tests/test_public_api.py" - "tests/test_redir.py" - "tests/test_runtime.py" - "tests/test_sender.py" - "tests/test_start_method.py" - "tests/test_tb_watcher.py" - "tests/test_telemetry_full.py" - "tests/test_util.py" - "tests/wandb_agent_test.py" - "tests/wandb_artifacts_test.py" - "tests/wandb_integration_test.py" - "tests/wandb_run_test.py" - "tests/wandb_settings_test.py" - "tests/wandb_sweep_test.py" - "tests/wandb_tensorflow_test.py" - "tests/wandb_verify_test.py" + "tests/unit_tests/integrations/test_keras.py" + "tests/unit_tests/integrations/test_torch.py" + "tests/unit_tests/test_cli.py" + "tests/unit_tests/test_data_types.py" + "tests/unit_tests/test_file_stream.py" + "tests/unit_tests/test_file_upload.py" + "tests/unit_tests/test_footer.py" + "tests/unit_tests/test_internal_api.py" + "tests/unit_tests/test_label_full.py" + "tests/unit_tests/test_login.py" + "tests/unit_tests/test_meta.py" + "tests/unit_tests/test_metric_full.py" + "tests/unit_tests/test_metric_internal.py" + "tests/unit_tests/test_mode_disabled.py" + "tests/unit_tests/test_model_workflows.py" + "tests/unit_tests/test_mp_full.py" + "tests/unit_tests/test_public_api.py" + "tests/unit_tests/test_redir.py" + "tests/unit_tests/test_runtime.py" + "tests/unit_tests/test_sender.py" + "tests/unit_tests/test_start_method.py" + "tests/unit_tests/test_tb_watcher.py" + "tests/unit_tests/test_telemetry_full.py" + "tests/unit_tests/test_util.py" + "tests/unit_tests/wandb_agent_test.py" + "tests/unit_tests/wandb_artifacts_test.py" + "tests/unit_tests/wandb_integration_test.py" + "tests/unit_tests/wandb_run_test.py" + "tests/unit_tests/wandb_settings_test.py" + "tests/unit_tests/wandb_sweep_test.py" + "tests/unit_tests/wandb_tensorflow_test.py" + "tests/unit_tests/wandb_verify_test.py" + "tests/unit_tests/test_tpu.py" + "tests/unit_tests/test_plots.py" + "tests/unit_tests/test_report_api.py" # Requires metaflow, which is not yet packaged. - "tests/integrations/test_metaflow.py" + "tests/unit_tests/integrations/test_metaflow.py" # Fails and borks the pytest runner as well. - "tests/wandb_test.py" + "tests/unit_tests/wandb_test.py" # Tries to access /homeless-shelter - "tests/test_tables.py" + "tests/unit_tests/test_tables.py" ]; # Disable test that fails on darwin due to issue with python3Packages.psutil: diff --git a/pkgs/development/python-modules/wandb/hardcode-git-path.patch b/pkgs/development/python-modules/wandb/hardcode-git-path.patch index 6d91add9d383..23097c535e06 100644 --- a/pkgs/development/python-modules/wandb/hardcode-git-path.patch +++ b/pkgs/development/python-modules/wandb/hardcode-git-path.patch @@ -1,7 +1,7 @@ -diff --git a/functional_tests/kfp/wandb_probe.py b/functional_tests/kfp/wandb_probe.py +diff --git a/tests/functional_tests/t0_main/kfp/wandb_probe.py b/tests/functional_tests/t0_main/kfp/wandb_probe.py index 82fadfe1..25c1454c 100644 ---- a/functional_tests/kfp/wandb_probe.py -+++ b/functional_tests/kfp/wandb_probe.py +--- a/tests/functional_tests/t0_main/kfp/wandb_probe.py ++++ b/tests/functional_tests/t0_main/kfp/wandb_probe.py @@ -5,7 +5,7 @@ import subprocess def wandb_probe_package(): if not os.environ.get("WB_PROBE_PACKAGE"): From 75fd4d5d21c5b977e0388cad85c741db076dd1dc Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 26 Jul 2022 04:20:00 +0000 Subject: [PATCH 2/2] python310Packages.wandb: update meta --- pkgs/development/python-modules/wandb/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix index 534b1cdba4f8..fc6dbadaecb6 100644 --- a/pkgs/development/python-modules/wandb/default.nix +++ b/pkgs/development/python-modules/wandb/default.nix @@ -159,7 +159,8 @@ buildPythonPackage rec { meta = with lib; { description = "A CLI and library for interacting with the Weights and Biases API"; - homepage = "https://github.com/wandb/client"; + homepage = "https://github.com/wandb/wandb"; + changelog = "https://github.com/wandb/wandb/raw/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ samuela ]; };