From 2a8c40ef77d6178bdf746661d407cf9e038aca36 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 20 May 2023 19:00:16 +0900 Subject: [PATCH 1/3] python3Packages.bayesian-optimization: 1.2.0 -> 1.4.3 Diff: https://github.com/bayesian-optimization/BayesianOptimization/compare/1.2.0...v1.4.3 --- .../bayesian-optimization/default.nix | 33 +++++-------------- 1 file changed, 9 insertions(+), 24 deletions(-) diff --git a/pkgs/development/python-modules/bayesian-optimization/default.nix b/pkgs/development/python-modules/bayesian-optimization/default.nix index 82b8738285bf..dd320b024962 100644 --- a/pkgs/development/python-modules/bayesian-optimization/default.nix +++ b/pkgs/development/python-modules/bayesian-optimization/default.nix @@ -4,46 +4,31 @@ , fetchFromGitHub , scikit-learn , scipy +, colorama , pytestCheckHook -, isPy27 -, fetchpatch +, pythonOlder }: buildPythonPackage rec { pname = "bayesian-optimization"; - version = "1.2.0"; - disabled = isPy27; + version = "1.4.3"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { - owner = "fmfn"; + owner = "bayesian-optimization"; repo = "BayesianOptimization"; - rev = version; - sha256 = "01mg9npiqh1qmq5ldnbpjmr8qkiw827msiv3crpkhbj4bdzasbfm"; + rev = "refs/tags/v${version}"; + hash = "sha256-Bp/ZhVSW5lTGwnsd/doOXu++Gxw/51owCfMm96Qmgd4="; }; propagatedBuildInputs = [ scikit-learn scipy - ]; - - patches = [ - # TypeError with scipy >= 1.8 - # https://github.com/fmfn/BayesianOptimization/issues/300 - (fetchpatch { - url = "https://github.com/fmfn/BayesianOptimization/commit/b4e09a25842985a4a0acea0c0f5c8789b7be125e.patch"; - hash = "sha256-PfcifCFd4GRNTA+4+T+6A760QAgyZxhDCTyzNn2crdM="; - name = "scipy_18_fix.patch"; - }) + colorama ]; nativeCheckInputs = [ pytestCheckHook ]; - disabledTests = [ - # New sklearn broke one test - # https://github.com/fmfn/BayesianOptimization/issues/243 - "test_suggest_with_one_observation" - ]; - pythonImportsCheck = [ "bayes_opt" ]; meta = with lib; { @@ -51,7 +36,7 @@ buildPythonPackage rec { description = '' A Python implementation of global optimization with gaussian processes ''; - homepage = "https://github.com/fmfn/BayesianOptimization"; + homepage = "https://github.com/bayesian-optimization/BayesianOptimization"; license = licenses.mit; maintainers = [ maintainers.juliendehos ]; }; From 64b0112629b4a2ba23931515ccea81cca7548b7c Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 20 May 2023 19:02:30 +0900 Subject: [PATCH 2/3] python3Packages.bayesian-optimization: format - set "format = setuptools" - add changelog to meta --- .../python-modules/bayesian-optimization/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/bayesian-optimization/default.nix b/pkgs/development/python-modules/bayesian-optimization/default.nix index dd320b024962..c7e1ae86752a 100644 --- a/pkgs/development/python-modules/bayesian-optimization/default.nix +++ b/pkgs/development/python-modules/bayesian-optimization/default.nix @@ -12,6 +12,8 @@ buildPythonPackage rec { pname = "bayesian-optimization"; version = "1.4.3"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { @@ -37,6 +39,7 @@ buildPythonPackage rec { A Python implementation of global optimization with gaussian processes ''; homepage = "https://github.com/bayesian-optimization/BayesianOptimization"; + changelog = "https://github.com/bayesian-optimization/BayesianOptimization/releases/tag/v${version}"; license = licenses.mit; maintainers = [ maintainers.juliendehos ]; }; From fc9c2a15a19f233f0ae07d8a240c4d76bdeace08 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 20 May 2023 19:41:34 +0900 Subject: [PATCH 3/3] python3Packages.bayesian-optimization: unbreak on darwin --- .../python-modules/bayesian-optimization/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/bayesian-optimization/default.nix b/pkgs/development/python-modules/bayesian-optimization/default.nix index c7e1ae86752a..dda52e8ebba8 100644 --- a/pkgs/development/python-modules/bayesian-optimization/default.nix +++ b/pkgs/development/python-modules/bayesian-optimization/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "bayes_opt" ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; + broken = stdenv.isLinux && stdenv.isAarch64; description = '' A Python implementation of global optimization with gaussian processes '';