Merge pull request #308856 from annaleeleaves/cvxpy-unbreak

python311Packages.cvxpy: unbreak
This commit is contained in:
Weijia Wang 2024-05-03 20:59:31 +02:00 committed by GitHub
commit 210a749573
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -1,7 +1,6 @@
{ lib
, stdenv
, buildPythonPackage
, fetchpatch
, clarabel
, cvxopt
, ecos
@ -30,16 +29,6 @@ buildPythonPackage rec {
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