From d1c5098858ae8ba6a52fa580c252ef0b6475c19e Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 10 Jan 2024 13:14:21 +0100 Subject: [PATCH 1/4] python311Packages.jaxopt: 0.8.2 -> 0.8.3 Changelog: https://github.com/google/jaxopt/releases/tag/jaxopt-v0.8.3 --- pkgs/development/python-modules/jaxopt/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/jaxopt/default.nix b/pkgs/development/python-modules/jaxopt/default.nix index 36a43027231d..17e448bba338 100644 --- a/pkgs/development/python-modules/jaxopt/default.nix +++ b/pkgs/development/python-modules/jaxopt/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "jaxopt"; - version = "0.8.2"; + version = "0.8.3"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "google"; repo = "jaxopt"; rev = "refs/tags/jaxopt-v${version}"; - hash = "sha256-uVOd3knoku5fKBNXOhCikGtjDuW3TtRqev94OM/8Pgk="; + hash = "sha256-T/BHSnuk3IRuLkBj3Hvb/tFIb7Au25jjQtvwL28OU1U="; }; propagatedBuildInputs = [ @@ -52,11 +52,6 @@ buildPythonPackage rec { "jaxopt.tree_util" ]; - disabledTests = [ - # Stack frame issue - "test_bisect" - ]; - meta = with lib; { homepage = "https://jaxopt.github.io"; description = "Hardware accelerated, batchable and differentiable optimizers in JAX"; From 57adf0a7ca61d42b65f9c59da7502a49bc0f83af Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 10 Jan 2024 13:14:42 +0100 Subject: [PATCH 2/4] python311Packages.jaxopt: use pytest-xdist to speed up tests --- pkgs/development/python-modules/jaxopt/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/jaxopt/default.nix b/pkgs/development/python-modules/jaxopt/default.nix index 17e448bba338..0f0e396b906d 100644 --- a/pkgs/development/python-modules/jaxopt/default.nix +++ b/pkgs/development/python-modules/jaxopt/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, pytest-xdist , pytestCheckHook , absl-py , cvxpy @@ -38,6 +39,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + pytest-xdist pytestCheckHook cvxpy optax From 73d94e4fd6e73a7b015590b086e5f6c06dfe28eb Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 10 Jan 2024 13:27:01 +0100 Subject: [PATCH 3/4] python311Packages.blackjax: 1.0.0 -> 1.1.0 Changelog: https://github.com/blackjax-devs/blackjax/releases/tag/1.1.0 --- pkgs/development/python-modules/blackjax/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/blackjax/default.nix b/pkgs/development/python-modules/blackjax/default.nix index 4e47e692657a..675f01991c3d 100644 --- a/pkgs/development/python-modules/blackjax/default.nix +++ b/pkgs/development/python-modules/blackjax/default.nix @@ -14,16 +14,16 @@ buildPythonPackage rec { pname = "blackjax"; - version = "1.0.0"; + version = "1.1.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "blackjax-devs"; - repo = pname; + repo = "blackjax"; rev = "refs/tags/${version}"; - hash = "sha256-hqOKSHyZ/BmOu6MJLeecD3H1BbLbZqywmlBzn3xjQRk="; + hash = "sha256-VAsCDI0rEqx0UJlD82wbZ8KuMi6LOjUlO6YzqnOfAGk="; }; nativeBuildInputs = [ setuptools-scm ]; From 23a47597a296c04307f265fc75df86d450f9138e Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 10 Jan 2024 13:27:12 +0100 Subject: [PATCH 4/4] python311Packages.blackjax: use pytest-xdist to speed up tests --- pkgs/development/python-modules/blackjax/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/blackjax/default.nix b/pkgs/development/python-modules/blackjax/default.nix index 675f01991c3d..f9521db79cb8 100644 --- a/pkgs/development/python-modules/blackjax/default.nix +++ b/pkgs/development/python-modules/blackjax/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, pytest-xdist , pytestCheckHook , setuptools-scm , fastprogress @@ -39,7 +40,10 @@ buildPythonPackage rec { typing-extensions ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + pytest-xdist + ]; disabledTestPaths = [ "tests/test_benchmarks.py" ]; disabledTests = [ # too slow