git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #146434 from drewrisinger/dr-pr-cvxpy-update

python3Packages.cvxpy: 1.1.13 -> 1.1.17, scs: 2.1.1 -> 3.0.0, python3Packages.scs: 2.1.1 -> 3.0.0

commit33177775e43053c7604ed06225f87729f0520e33 authorBenjamin Hipple <bhipple@protonmail.com> dateThu 18 Nov 2021, 16:21 (5 years ago) parent546a756c254202
5 files changed+14−21
compare with master
unifiedsplit
pkgs/development/libraries/science/math/scs/default.nix+2−2 pkgs/development/python-modules/cvxpy/default.nix+2−2 pkgs/development/python-modules/qiskit-aer/default.nix+1−1 pkgs/development/python-modules/scs/default.nix+8−15 pkgs/top-level/python-packages.nix+1−1
pkgs/development/libraries/science/math/scs/default.nix+2−2
@@ -4,13 +4,13 @@ assert (!blas.isILP64) && (!lapack.isILP64);
44
55stdenv.mkDerivation rec {
66 pname = "scs";
7− version = "2.1.1";
7+ version = "3.0.0";
88
99 src = fetchFromGitHub {
1010 owner = "cvxgrp";
1111 repo = "scs";
1212 rev = version;
13− sha256 = "14g5m3lcvrbwpq1bq0liq00jh0gm1947lg3z4jfsp43f6p5alb20";
13+ sha256 = "sha256-Lly28KDDZ5hJyiMOhiX/3VaKs0iPcSqizOurZevhfCo=";
1414 };
1515
1616 # Actually link and add libgfortran to the rpath
pkgs/development/python-modules/cvxpy/default.nix+2−2
@@ -16,14 +16,14 @@
1616
1717buildPythonPackage rec {
1818 pname = "cvxpy";
19− version = "1.1.13";
19+ version = "1.1.17";
2020 format = "pyproject";
2121
2222 disabled = pythonOlder "3.5";
2323
2424 src = fetchPypi {
2525 inherit pname version;
26− sha256 = "012avhf0a8n9xyy4g3xcr5z8z2a3m6rnqic6gfs9fq6p9bkq3ix9";
26+ sha256 = "sha256-M5fTuJ13Dqnw/DWbHJs6/t5qDTvqHP8g4mU7E0Uc24o=";
2727 };
2828
2929 propagatedBuildInputs = [
pkgs/development/python-modules/qiskit-aer/default.nix+1−1
@@ -88,6 +88,7 @@ buildPythonPackage rec {
8888 ];
8989 # Slow tests
9090 disabledTests = [
91+ "test_clifford" # fails on cvxpy >= 1.1.15. https://github.com/Qiskit/qiskit-aer/pull/1318. Remove in future.
9192 "test_snapshot" # TODO: these ~30 tests fail on setup due to pytest fixture issues?
9293 "test_initialize_2" # TODO: simulations appear incorrect, off by >10%.
9394
@@ -111,7 +112,6 @@ buildPythonPackage rec {
111112 "_144"
112113 "test_sparse_output_probabilities"
113114 "test_reset_2_qubit"
114− # "test_clifford"
115115 ];
116116 checkInputs = [
117117 pytestCheckHook
pkgs/development/python-modules/scs/default.nix+8−15
@@ -5,26 +5,22 @@
55, lapack
66, numpy
77, scipy
8−, scs
98 # check inputs
10−, nose
9+, pytestCheckHook
1110}:
1211
1312buildPythonPackage rec {
14− inherit (scs) pname version;
13+ pname = "scs";
14+ version = "3.0.0";
1515
1616 src = fetchFromGitHub {
1717 owner = "bodono";
1818 repo = "scs-python";
19− rev = "f02abdc0e2e0a5851464e30f6766ccdbb19d73f0"; # need to choose commit manually, untagged
20− sha256 = "174b5s7cwgrn1m55jlrszdl403zhpzc4yl9acs6kjv9slmg1mmjr";
19+ rev = version;
20+ sha256 = "sha256-7OgqCo21S0FDev8xv6/8iGFXg8naVi93zd8v1f9iaWw=";
21+ fetchSubmodules = true;
2122 };
2223
23− preConfigure = ''
24− rm -r scs
25− ln -s ${scs.src} scs
26− '';
27−
2824 buildInputs = [
2925 lapack
3026 blas
@@ -35,10 +31,7 @@ buildPythonPackage rec {
3531 scipy
3632 ];
3733
38− checkInputs = [ nose ];
39− checkPhase = ''
40− nosetests
41− '';
34+ checkInputs = [ pytestCheckHook ];
4235 pythonImportsCheck = [ "scs" ];
4336
4437 meta = with lib; {
@@ -50,7 +43,7 @@ buildPythonPackage rec {
5043 '';
5144 homepage = "https://github.com/cvxgrp/scs"; # upstream C package
5245 downloadPage = "https://github.com/bodono/scs-python";
53− license = licenses.gpl3;
46+ license = licenses.mit;
5447 maintainers = with maintainers; [ drewrisinger ];
5548 };
5649}
pkgs/top-level/python-packages.nix+1−1
@@ -8436,7 +8436,7 @@ in {
84368436
84378437 scikit-survival = callPackage ../development/python-modules/scikit-survival { };
84388438
8439− scs = callPackage ../development/python-modules/scs { scs = pkgs.scs; };
8439+ scs = callPackage ../development/python-modules/scs { };
84408440
84418441 sdnotify = callPackage ../development/python-modules/sdnotify { };
84428442