Merge pull request #335544 from GaetanLepage/cvxpy

python312Packages.cvxpy: 1.5.2 -> 1.5.3

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

@@ -4,7 +4,6 @@
   buildPythonPackage,
   pythonOlder,
   fetchFromGitHub,
-  fetchpatch,
 
   # build-system
   numpy,
@@ -27,28 +26,18 @@
 
 buildPythonPackage rec {
   pname = "cvxpy";
-  version = "1.5.2";
+  version = "1.5.3";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "cvxpy";
     repo = "cvxpy";
     rev = "refs/tags/v${version}";
-    hash = "sha256-g4JVgykGNFT4ZEi5f8hkVjd7eUVJ+LxvPvmiVa86r1Y=";
+    hash = "sha256-6RaEyFckvF3WhbfeffysMB/zt+aU1NU6B7Nm06znt9k=";
   };
 
-  patches = [
-    # Fix invalid uses of the scipy library
-    # https://github.com/cvxpy/cvxpy/pull/2508
-    (fetchpatch {
-      name = "scipy-1-14-compat";
-      url = "https://github.com/cvxpy/cvxpy/pull/2508/commits/c343f4381c69f7e6b51a86b3eee8b42fbdda9d6a.patch";
-      hash = "sha256-SqIdPs9K+GuCLCEJMHUQ+QGWNH5B3tKuwr46tD9Ao2k=";
-    })
-  ];
-
   # we need to patch out numpy version caps from upstream
   postPatch = ''
     substituteInPlace pyproject.toml \
@@ -81,18 +70,12 @@ buildPythonPackage rec {
 
   pytestFlagsArray = [ "cvxpy" ];
 
-  disabledTests =
-    [
+  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" ];