From d029e9b92e3c347345251a3d4b4c7e3e5adac267 Mon Sep 17 00:00:00 2001
From: Drew Risinger <drewrisinger@users.noreply.github.com>
Date: Mon, 11 Jan 2021 19:35:36 -0500
Subject: [PATCH] python3Packages.osqp: 0.6.1 -> 0.6.2

---
 pkgs/development/python-modules/osqp/default.nix | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/osqp/default.nix b/pkgs/development/python-modules/osqp/default.nix
index 88189493a62f..e2eb0139f123 100644
--- a/pkgs/development/python-modules/osqp/default.nix
+++ b/pkgs/development/python-modules/osqp/default.nix
@@ -4,6 +4,7 @@
 , cmake
 , future
 , numpy
+, qdldl
 , scipy
 # check inputs
 , pytestCheckHook
@@ -11,11 +12,11 @@
 
 buildPythonPackage rec {
   pname = "osqp";
-  version = "0.6.1";
+  version = "0.6.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "130frig5bznfacqp9jwbshmbqd2xw3ixdspsbkrwsvkdaab7kca7";
+    sha256 = "262162039f6ad6c9ffee658541b18cfae8240b65edbde71d9b9e3af42fbfe4b3";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -24,15 +25,22 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     future
     numpy
+    qdldl
     scipy
   ];
 
   pythonImportsCheck = [ "osqp" ];
   checkInputs = [ pytestCheckHook ];
-  dontUseSetuptoolsCheck = true;  # don't run checks twice
   disabledTests = [
     "mkl_"
-    "update_matrices_tests" # broken w/ scipy >= 1.5.0. Remove next release. See https://github.com/oxfordcontrol/osqp-python/issues/44
+  ];
+    pytestFlagsArray = [
+    # These cannot collect b/c of circular dependency on cvxpy: https://github.com/oxfordcontrol/osqp-python/issues/50
+    "--ignore=module/tests/basic_test.py"
+    "--ignore=module/tests/feasibility_test.py"
+    "--ignore=module/tests/polishing_test.py"
+    "--ignore=module/tests/unconstrained_test.py"
+    "--ignore=module/tests/update_matrices_test.py"
   ];
 
   meta = with lib; {