Unverified Commit 33177775 authored by Benjamin Hipple's avatar Benjamin Hipple Committed by GitHub
Browse files

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
parents 546a756e c2542026

pkgs/development/libraries/science/math/scs/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -4,13 +4,13 @@ assert (!blas.isILP64) && (!lapack.isILP64); 


stdenv.mkDerivation rec {

  pname = "scs";

  version = "2.1.1";

  version = "3.0.0";



  src = fetchFromGitHub {

    owner = "cvxgrp";

    repo = "scs";

    rev = version;

    sha256 = "14g5m3lcvrbwpq1bq0liq00jh0gm1947lg3z4jfsp43f6p5alb20";

    sha256 = "sha256-Lly28KDDZ5hJyiMOhiX/3VaKs0iPcSqizOurZevhfCo=";

  };



  # Actually link and add libgfortran to the rpath

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

+2 −2
Original line number Diff line number Diff line
@@ -16,14 +16,14 @@ 


buildPythonPackage rec {

  pname = "cvxpy";

  version = "1.1.13";

  version = "1.1.17";

  format = "pyproject";



  disabled = pythonOlder "3.5";



  src = fetchPypi {

    inherit pname version;

    sha256 = "012avhf0a8n9xyy4g3xcr5z8z2a3m6rnqic6gfs9fq6p9bkq3ix9";

    sha256 = "sha256-M5fTuJ13Dqnw/DWbHJs6/t5qDTvqHP8g4mU7E0Uc24o=";

  };



  propagatedBuildInputs = [

pkgs/development/python-modules/qiskit-aer/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ buildPythonPackage rec { 
  ];

  # Slow tests

  disabledTests = [

    "test_clifford" # fails on cvxpy >= 1.1.15. https://github.com/Qiskit/qiskit-aer/pull/1318. Remove in future.

    "test_snapshot" # TODO: these ~30 tests fail on setup due to pytest fixture issues?

    "test_initialize_2" # TODO: simulations appear incorrect, off by >10%.
@@ -111,7 +112,6 @@ buildPythonPackage rec { 
    "_144"

    "test_sparse_output_probabilities"

    "test_reset_2_qubit"

    # "test_clifford"

  ];

  checkInputs = [

    pytestCheckHook

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

+8 −15
Original line number Diff line number Diff line
@@ -5,26 +5,22 @@ 
, lapack

, numpy

, scipy

, scs

  # check inputs

, nose

, pytestCheckHook

}:



buildPythonPackage rec {

  inherit (scs) pname version;

  pname = "scs";

  version = "3.0.0";



  src = fetchFromGitHub {

    owner = "bodono";

    repo = "scs-python";

    rev = "f02abdc0e2e0a5851464e30f6766ccdbb19d73f0"; # need to choose commit manually, untagged

    sha256 = "174b5s7cwgrn1m55jlrszdl403zhpzc4yl9acs6kjv9slmg1mmjr";

    rev = version;

    sha256 = "sha256-7OgqCo21S0FDev8xv6/8iGFXg8naVi93zd8v1f9iaWw=";

    fetchSubmodules = true;

  };



  preConfigure = ''

    rm -r scs

    ln -s ${scs.src} scs

  '';



  buildInputs = [

    lapack

    blas
@@ -35,10 +31,7 @@ buildPythonPackage rec { 
    scipy

  ];



  checkInputs = [ nose ];

  checkPhase = ''

    nosetests

  '';

  checkInputs = [ pytestCheckHook ];

  pythonImportsCheck = [ "scs" ];



  meta = with lib; {
@@ -50,7 +43,7 @@ buildPythonPackage rec { 
    '';

    homepage = "https://github.com/cvxgrp/scs"; # upstream C package

    downloadPage = "https://github.com/bodono/scs-python";

    license = licenses.gpl3;

    license = licenses.mit;

    maintainers = with maintainers; [ drewrisinger ];

  };

}

pkgs/top-level/python-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -8436,7 +8436,7 @@ in { 


  scikit-survival = callPackage ../development/python-modules/scikit-survival { };



  scs = callPackage ../development/python-modules/scs { scs = pkgs.scs; };

  scs = callPackage ../development/python-modules/scs { };



  sdnotify = callPackage ../development/python-modules/sdnotify { };