Unverified Commit 21e303ae authored by Samuel Ainsworth's avatar Samuel Ainsworth Committed by GitHub
Browse files

Merge pull request #201129 from samuela/samuela/wandb 

python3Packages.wandb: 0.13.4 -> 0.13.5
parents 97b8d945 980a853c

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

+2 −4
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 


buildPythonPackage rec {

  pname = "wandb";

  version = "0.13.4";

  version = "0.13.5";

  format = "setuptools";



  disabled = pythonOlder "3.6";
@@ -48,7 +48,7 @@ buildPythonPackage rec { 
    owner = pname;

    repo = pname;

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

    hash = "sha256-+3fLExLQChXKx1LCnNvPLNTUzopP+D+6tOikFrjdysY=";

    hash = "sha256-1GoFmncG5bUWJOIUDLatopQMxCFsmlcj8aofJMGUTzQ=";

  };



  patches = [
@@ -132,7 +132,6 @@ buildPythonPackage rec { 
    "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"
@@ -145,7 +144,6 @@ buildPythonPackage rec { 
    "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_tpu.py"

    "tests/unit_tests/test_util.py"



    # Tries to access /homeless-shelter

pkgs/development/python-modules/wandb/hardcode-git-path.patch

+3 −16
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ diff --git a/wandb/cli/cli.py b/wandb/cli/cli.py 
index 5767e61c..56009fec 100644

--- a/wandb/cli/cli.py

+++ b/wandb/cli/cli.py

@@ -1917,7 +1917,7 @@ def restore(ctx, run, no_git, branch, project, entity):

@@ -1919,7 +1919,7 @@ def restore(ctx, run, no_git, branch, project, entity):

     commit, json_config, patch_content, metadata = api.run_config(

         project, run=run, entity=entity

     )
@@ -24,7 +24,7 @@ index 5767e61c..56009fec 100644 
     image = metadata.get("docker")

     restore_message = (

         """`wandb restore` needs to be run from the same git repository as the original run.

@@ -1936,7 +1936,7 @@ Run `git clone %s` and restore from there or pass the --no-git flag."""

@@ -1938,7 +1938,7 @@ Run `git clone %s` and restore from there or pass the --no-git flag."""



     if commit and api.git.enabled:

         wandb.termlog(f"Fetching origin and finding commit: {commit}")
@@ -33,7 +33,7 @@ index 5767e61c..56009fec 100644 
         try:

             api.git.repo.commit(commit)

         except ValueError:

@@ -1990,7 +1990,7 @@ Run `git clone %s` and restore from there or pass the --no-git flag."""

@@ -1992,7 +1992,7 @@ Run `git clone %s` and restore from there or pass the --no-git flag."""

             # --reject is necessary or else this fails any time a binary file

             # occurs in the diff

             exit_code = subprocess.call(
@@ -42,19 +42,6 @@ index 5767e61c..56009fec 100644 
             )

             if exit_code == 0:

                 wandb.termlog("Applied patch")

diff --git a/wandb/sdk/internal/meta.py b/wandb/sdk/internal/meta.py

index 6c53f750..c385951a 100644

--- a/wandb/sdk/internal/meta.py

+++ b/wandb/sdk/internal/meta.py

@@ -125,7 +125,7 @@ class Meta:

         logger.debug("save patches")

         try:

             root = self._git.root

-            diff_args = ["git", "diff"]

+            diff_args = ["@git@", "diff"]

             if self._git.has_submodule_diff:

                 diff_args.append("--submodule=diff")



diff --git a/wandb/vendor/graphql-core-1.1/wandb_graphql/pyutils/version.py b/wandb/vendor/graphql-core-1.1/wandb_graphql/pyutils/version.py

index 614df9f5..38db460b 100644

--- a/wandb/vendor/graphql-core-1.1/wandb_graphql/pyutils/version.py