Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

python3Packages.qiskit: 0.23.5 -> 0.24.0 #115211

Merged
merged 4 commits into from Mar 6, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions pkgs/development/python-modules/qiskit-aer/default.nix
Expand Up @@ -27,15 +27,16 @@

buildPythonPackage rec {
pname = "qiskit-aer";
version = "0.7.4";
version = "0.7.6";
format = "pyproject";

disabled = pythonOlder "3.6";

src = fetchFromGitHub {
owner = "Qiskit";
repo = "qiskit-aer";
rev = version;
sha256 = "sha256-o6c1ZcGFZ3pwinzMTif1nqF29Wq0Nog1++ZoJGuiKxo=";
sha256 = "0595as4rxjrd5dqx54ywz3rjsjk0z7r41bq0z9r8y1h7zgvvlrmn";
};

nativeBuildInputs = [
Expand Down Expand Up @@ -64,6 +65,7 @@ buildPythonPackage rec {
substituteInPlace setup.py --replace "'cmake!=3.17,!=3.17.0'," ""
'';

# Disable using conan for build
preBuild = ''
export DISABLE_CONAN=1
'';
Expand Down
Expand Up @@ -22,6 +22,7 @@
, nbconvert
, nbformat
, pproxy
, qiskit-aer
, vcrpy
}:

Expand All @@ -38,15 +39,15 @@ let
in
buildPythonPackage rec {
pname = "qiskit-ibmq-provider";
version = "0.11.1";
version = "0.12.1";

disabled = pythonOlder "3.6";

src = fetchFromGitHub {
owner = "Qiskit";
repo = pname;
rev = version;
sha256 = "0b5mnq8f5844idnsmp84lpkvlpszfwwi998yvggcgaayw1dbk53h";
sha256 = "1i5dj5dl0hxqd61bdflyy6yq958fj9qhf6s6m40n1vnql7g50gdx";
};

propagatedBuildInputs = [
Expand All @@ -64,6 +65,7 @@ buildPythonPackage rec {
nbconvert
nbformat
pproxy
qiskit-aer
vcrpy
] ++ lib.optionals (!withVisualization) visualizationPackages;

Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/qiskit/default.nix
Expand Up @@ -15,15 +15,15 @@
buildPythonPackage rec {
pname = "qiskit";
# NOTE: This version denotes a specific set of subpackages. See https://qiskit.org/documentation/release_notes.html#version-history
version = "0.23.5";
version = "0.24.0";

disabled = pythonOlder "3.6";

src = fetchFromGitHub {
owner = "qiskit";
repo = "qiskit";
rev = version;
sha256 = "sha256-qtMFztAeqNz0FSgQnOOrvAdPcbUCAal7KrVmpNvvBiY=";
sha256 = "1b78q75bi666v0yj33bkjlc40d2172dsq5yp1s2kkisjfa8qmh7h";
};

propagatedBuildInputs = [
Expand Down
14 changes: 8 additions & 6 deletions pkgs/development/python-modules/retworkx/default.nix
@@ -1,39 +1,41 @@
{ lib
, buildPythonPackage
, pythonOlder
, rustPlatform
, fetchFromGitHub

# Check inputs
, pytestCheckHook
, networkx
, numpy
}:

buildPythonPackage rec {
pname = "retworkx";
version = "0.6.0";
version = "0.8.0";
format = "pyproject";
disabled = pythonOlder "3.6";

src = fetchFromGitHub {
owner = "Qiskit";
repo = "retworkx";
rev = version;
sha256 = "11n30ldg3y3y6qxg3hbj837pnbwjkqw3nxq6frds647mmmprrd20";
sha256 = "0plpri6a3d6f1000kmcah9066vq2i37d14bdf8sm96493fhpqhrd";
};

cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-heOBK8qi2nuc/Ib+I/vLzZ1fUUD/G/KTw9d7M4Hz5O0=";
hash = "sha256-+k779gmge8wDdoZrWn9ND47kUqt7pqe75Zuj2Byfefo=";
};

format = "pyproject";

nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook ];

# Needed b/c need to check AFTER python wheel is installed (using Rust Build, not buildPythonPackage)
doCheck = false;
doInstallCheck = true;

installCheckInputs = [ pytestCheckHook numpy ];
installCheckInputs = [ pytestCheckHook networkx numpy ];

preCheck = ''
export TESTDIR=$(mktemp -d)
Expand Down
2 changes: 1 addition & 1 deletion pkgs/top-level/python-packages.nix
Expand Up @@ -6951,7 +6951,7 @@ in {

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

retworkx = disabledIf (pythonOlder "3.5") (toPythonModule (callPackage ../development/python-modules/retworkx { }));
retworkx = callPackage ../development/python-modules/retworkx { };

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

Expand Down