diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2023-05-15 10:29:41 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-05-15 10:29:41 +0200 |
commit | 17a689596b72d1906883484838eb1aaf51ab8001 (patch) | |
tree | 5c913f2209bc7173bf9c1c43500b7110f080a08b | |
parent | 70c1240b6fb88a51f06942b00dc5092bc13fd35c (diff) | |
parent | 3d95de61994d2cc814feee8a7a88652194afd985 (diff) |
Merge pull request #225812 from ChrisPattison/rustworkx
-rw-r--r-- | pkgs/development/python-modules/qiskit-nature/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/python-modules/qiskit-terra/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/python-modules/retworkx/default.nix | 67 | ||||
-rw-r--r-- | pkgs/top-level/python-aliases.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
5 files changed, 5 insertions, 73 deletions
diff --git a/pkgs/development/python-modules/qiskit-nature/default.nix b/pkgs/development/python-modules/qiskit-nature/default.nix index d92d27b7729e4..629dc04bd3f44 100644 --- a/pkgs/development/python-modules/qiskit-nature/default.nix +++ b/pkgs/development/python-modules/qiskit-nature/default.nix @@ -7,7 +7,7 @@ , numpy , psutil , qiskit-terra -, retworkx +, rustworkx , scikit-learn , scipy , withPyscf ? false @@ -37,7 +37,7 @@ buildPythonPackage rec { numpy psutil qiskit-terra - retworkx + rustworkx scikit-learn scipy ] ++ lib.optional withPyscf pyscf; diff --git a/pkgs/development/python-modules/qiskit-terra/default.nix b/pkgs/development/python-modules/qiskit-terra/default.nix index cade2325c61f2..f6c5010fbfb72 100644 --- a/pkgs/development/python-modules/qiskit-terra/default.nix +++ b/pkgs/development/python-modules/qiskit-terra/default.nix @@ -14,7 +14,7 @@ , psutil , python-constraint , python-dateutil -, retworkx +, rustworkx , scipy , scikit-quant ? null , setuptools-rust @@ -85,7 +85,7 @@ buildPythonPackage rec { psutil python-constraint python-dateutil - retworkx + rustworkx scipy scikit-quant stevedore diff --git a/pkgs/development/python-modules/retworkx/default.nix b/pkgs/development/python-modules/retworkx/default.nix deleted file mode 100644 index 1e42af234c25b..0000000000000 --- a/pkgs/development/python-modules/retworkx/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ lib -, stdenv -, buildPythonPackage -, pythonOlder -, rustPlatform -, fetchFromGitHub -, libiconv - # Check inputs -, pytestCheckHook -, fixtures -, graphviz -, matplotlib -, networkx -, numpy -, pydot -}: - -buildPythonPackage rec { - pname = "retworkx"; - version = "0.11.0"; - format = "pyproject"; - disabled = pythonOlder "3.6"; - - src = fetchFromGitHub { - owner = "Qiskit"; - repo = "retworkx"; - rev = version; - hash = "sha256-o3XPMTaiFH5cBtyqtW650wiDBElLvCmERr2XwwdPO1c="; - }; - - cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; - name = "${pname}-${version}"; - hash = "sha256-Zhk4m+HNtimhPWfiBLi9dqJ0fp2D8d0u9k6ROG0/jBo="; - }; - - nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook ]; - - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; - - pythonImportsCheck = [ "retworkx" ]; - nativeCheckInputs = [ - pytestCheckHook - fixtures - graphviz - matplotlib - networkx - numpy - pydot - ]; - - preCheck = '' - export TESTDIR=$(mktemp -d) - cp -r tests/ $TESTDIR - pushd $TESTDIR - ''; - postCheck = "popd"; - - meta = with lib; { - description = "A python graph library implemented in Rust."; - homepage = "https://retworkx.readthedocs.io/en/latest/index.html"; - downloadPage = "https://github.com/Qiskit/retworkx/releases"; - changelog = "https://github.com/Qiskit/retworkx/releases/tag/${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ drewrisinger ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index d1652a947a611..85f68182349db 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -251,6 +251,7 @@ mapAliases ({ Quandl = quandl; # added 2023-02-19 qiskit-aqua = throw "qiskit-aqua has been removed due to deprecation, with its functionality moved to different qiskit packages"; rdflib-jsonld = throw "rdflib-jsonld is not compatible with rdflib 6"; # added 2021-11-05 + retworkx = rustworkx; # added 2023-05-14 repeated_test = repeated-test; # added 2022-11-15 requests_oauthlib = requests-oauthlib; # added 2022-02-12 requests_toolbelt = requests-toolbelt; # added 2017-09-26 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f6585c109103f..641fb4d40820b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10470,8 +10470,6 @@ self: super: with self; { returns = callPackage ../development/python-modules/returns { }; - retworkx = callPackage ../development/python-modules/retworkx { }; - rfc3339 = callPackage ../development/python-modules/rfc3339 { }; rfc3339-validator = callPackage ../development/python-modules/rfc3339-validator { }; |