diff options
Diffstat (limited to 'pkgs/development/python-modules/cvxpy/default.nix')
-rw-r--r-- | pkgs/development/python-modules/cvxpy/default.nix | 88 |
1 files changed, 37 insertions, 51 deletions
diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix index 16a5adbf15948..d6fce58eaa734 100644 --- a/pkgs/development/python-modules/cvxpy/default.nix +++ b/pkgs/development/python-modules/cvxpy/default.nix @@ -1,45 +1,35 @@ -{ lib -, stdenv -, buildPythonPackage -, fetchpatch -, clarabel -, cvxopt -, ecos -, fetchPypi -, numpy -, osqp -, pytestCheckHook -, pythonOlder -, scipy -, scs -, setuptools -, wheel -, pybind11 -, useOpenmp ? (!stdenv.isDarwin) +{ + lib, + stdenv, + buildPythonPackage, + clarabel, + cvxopt, + ecos, + fetchPypi, + numpy, + osqp, + pytestCheckHook, + pythonOlder, + scipy, + scs, + setuptools, + wheel, + pybind11, + useOpenmp ? (!stdenv.isDarwin), }: buildPythonPackage rec { pname = "cvxpy"; - version = "1.4.2"; + version = "1.4.3"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-CjhqV4jb14t7IN0HFSTsY2yPpys2KOafGrxxTI+YEeU="; + hash = "sha256-sbB4yMBZI60Sjn2BSwvhwzesBSYqeLdXqOb5V2SK2VM="; }; - patches = [ - # fix QP tests. remove on next update - # https://github.com/cvxpy/cvxpy/pull/2343 - (fetchpatch { - name = "fix-QP-tests.patch"; - url = "https://github.com/cvxpy/cvxpy/commit/4c8549b9820e64c1b06f5d71c5d3f36528dd4a76.patch"; - hash = "sha256-43zjS1STEBaGgj1jEOlX3XzMsE4wjoKAk8ApJo98AzY="; - }) - ]; - # we need to patch out numpy version caps from upstream postPatch = '' sed -i 's/\(numpy>=[0-9.]*\),<[0-9.]*;/\1;/g' pyproject.toml @@ -61,9 +51,7 @@ buildPythonPackage rec { scs ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; # Required flags from https://github.com/cvxpy/cvxpy/releases/tag/v1.1.11 preBuild = lib.optionalString useOpenmp '' @@ -71,28 +59,26 @@ buildPythonPackage rec { export LDFLAGS="-lgomp" ''; - pytestFlagsArray = [ - "cvxpy" - ]; + pytestFlagsArray = [ "cvxpy" ]; - disabledTests = [ - # Disable the slowest benchmarking tests, cuts test time in half - "test_tv_inpainting" - "test_diffcp_sdp_example" - "test_huber" - "test_partial_problem" - # https://github.com/cvxpy/cvxpy/issues/2174 - "test_scipy_mi_time_limit_reached" - ] ++ lib.optionals stdenv.isAarch64 [ - "test_ecos_bb_mi_lp_2" # https://github.com/cvxpy/cvxpy/issues/1241#issuecomment-780912155 - ]; + disabledTests = + [ + # Disable the slowest benchmarking tests, cuts test time in half + "test_tv_inpainting" + "test_diffcp_sdp_example" + "test_huber" + "test_partial_problem" + # https://github.com/cvxpy/cvxpy/issues/2174 + "test_scipy_mi_time_limit_reached" + ] + ++ lib.optionals stdenv.isAarch64 [ + "test_ecos_bb_mi_lp_2" # https://github.com/cvxpy/cvxpy/issues/1241#issuecomment-780912155 + ]; - pythonImportsCheck = [ - "cvxpy" - ]; + pythonImportsCheck = [ "cvxpy" ]; meta = with lib; { - description = "A domain-specific language for modeling convex optimization problems in Python"; + description = "Domain-specific language for modeling convex optimization problems in Python"; homepage = "https://www.cvxpy.org/"; downloadPage = "https://github.com/cvxpy/cvxpy//releases"; changelog = "https://github.com/cvxpy/cvxpy/releases/tag/v${version}"; |