From a0fd0488735e16218663422ca1c64acee7699246 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 13 Sep 2024 13:13:53 +0200 Subject: [PATCH 1/3] python312Packages.asteval: 1.0.2 -> 1.0.3 Diff: https://github.com/lmfit/asteval/compare/refs/tags/1.0.2...1.0.3 Changelog: https://github.com/lmfit/asteval/releases/tag/1.0.3 --- pkgs/development/python-modules/asteval/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asteval/default.nix b/pkgs/development/python-modules/asteval/default.nix index 322bb50e711f..090188b5cbc9 100644 --- a/pkgs/development/python-modules/asteval/default.nix +++ b/pkgs/development/python-modules/asteval/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "asteval"; - version = "1.0.2"; + version = "1.0.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "lmfit"; repo = "asteval"; rev = "refs/tags/${version}"; - hash = "sha256-TIMyfX8bpzey0hw0lBMcdZVnc07j9PFVjn4YbX4oW/8="; + hash = "sha256-CAjj5vlXCfelH7nyE/tS44ThCQrCwrNETyjXEVbfmiA="; }; postPatch = '' From f9249f8361d7cea20be43dc1972cc49514baea4f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 14 Sep 2024 15:47:59 +0200 Subject: [PATCH 2/3] python312Packages.lmfit: refactor --- .../python-modules/lmfit/default.nix | 36 +++++++++++-------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/lmfit/default.nix b/pkgs/development/python-modules/lmfit/default.nix index 926944ee55e3..2445006427c2 100644 --- a/pkgs/development/python-modules/lmfit/default.nix +++ b/pkgs/development/python-modules/lmfit/default.nix @@ -1,40 +1,43 @@ { lib, buildPythonPackage, - fetchPypi, - setuptools, - setuptools-scm, asteval, dill, - numpy, - scipy, - uncertainties, - pytestCheckHook, - pandas, + fetchPypi, matplotlib, + numpy, + pandas, + pytestCheckHook, + pythonOlder, + scipy, + setuptools-scm, + setuptools, + uncertainties, }: buildPythonPackage rec { pname = "lmfit"; version = "1.3.2"; - pyproject = true; + disabled = pythonOlder "3.8"; + src = fetchPypi { inherit pname version; hash = "sha256-Mb7q4fAnwbjBTc1/LoSIqAt1+zied/ymd1Sb3C/ll7s="; }; postPatch = '' - substituteInPlace pyproject.toml --replace "--cov=lmfit --cov-report html" "" + substituteInPlace pyproject.toml \ + --replace-fail "--cov=lmfit --cov-report html" "" ''; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ asteval dill numpy @@ -43,14 +46,17 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytestCheckHook - pandas matplotlib + pandas + pytestCheckHook ]; + pythonImportsCheck = [ "lmfit" ]; + meta = with lib; { description = "Least-Squares Minimization with Bounds and Constraints"; - homepage = "https://lmfit-py.readthedocs.io/"; + homepage = "https://lmfit.github.io/lmfit-py/"; + changelog = "https://github.com/lmfit/lmfit-py/releases/tag/${version}"; license = licenses.bsd3; maintainers = with maintainers; [ nomeata ]; }; From 87d3c358df18520bbb03116ab8913a1e4238853c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 14 Sep 2024 15:49:35 +0200 Subject: [PATCH 3/3] python312Packages.lmfit: disable failing test --- pkgs/development/python-modules/lmfit/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/lmfit/default.nix b/pkgs/development/python-modules/lmfit/default.nix index 2445006427c2..16046208ea9a 100644 --- a/pkgs/development/python-modules/lmfit/default.nix +++ b/pkgs/development/python-modules/lmfit/default.nix @@ -53,6 +53,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "lmfit" ]; + disabledTests = [ "test_check_ast_errors" ]; + meta = with lib; { description = "Least-Squares Minimization with Bounds and Constraints"; homepage = "https://lmfit.github.io/lmfit-py/";