From fc21603717d32ff0ed17736c6e184ada9708ec2e Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 14 Dec 2019 12:05:18 -0500 Subject: [PATCH 1/2] pythonPackages.root_numpy: remove --- .../python-modules/root_numpy/default.nix | 27 ------------------- .../python-modules/rootpy/default.nix | 4 +-- pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 2 insertions(+), 31 deletions(-) delete mode 100644 pkgs/development/python-modules/root_numpy/default.nix diff --git a/pkgs/development/python-modules/root_numpy/default.nix b/pkgs/development/python-modules/root_numpy/default.nix deleted file mode 100644 index 910a37ddd576..000000000000 --- a/pkgs/development/python-modules/root_numpy/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, fetchPypi, isPy3k, buildPythonPackage, numpy, root, nose, setuptools }: - -buildPythonPackage rec { - pname = "root_numpy"; - version = "4.8.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "5842bbcde92133f60a61f56e9f0a875a0dbc2a567cc65a9ac141ecd72e416878"; - }; - - disabled = isPy3k; # blocked by #27649 - checkInputs = [ nose ]; - checkPhase = '' - python setup.py install_lib -d . - nosetests -s -v root_numpy - ''; - - propagatedBuildInputs = [ numpy root setuptools ]; - - meta = with lib; { - homepage = http://scikit-hep.org/root_numpy; - license = licenses.bsd3; - description = "The interface between ROOT and NumPy"; - maintainers = with maintainers; [ veprbl ]; - }; -} diff --git a/pkgs/development/python-modules/rootpy/default.nix b/pkgs/development/python-modules/rootpy/default.nix index 8384510468a4..2478f6bfea35 100644 --- a/pkgs/development/python-modules/rootpy/default.nix +++ b/pkgs/development/python-modules/rootpy/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, isPy3k, buildPythonPackage, numpy, matplotlib, root, root_numpy, tables, pytest }: +{ lib, fetchPypi, isPy3k, buildPythonPackage, numpy, matplotlib, root, tables, pytest }: buildPythonPackage rec { pname = "rootpy"; @@ -11,7 +11,7 @@ buildPythonPackage rec { disabled = isPy3k; - propagatedBuildInputs = [ matplotlib numpy root root_numpy tables ]; + propagatedBuildInputs = [ matplotlib numpy root tables ]; checkInputs = [ pytest ]; checkPhase = '' diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6e27fe28ea0a..4961a1dd7822 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5044,8 +5044,6 @@ in { Pyro4 = callPackage ../development/python-modules/pyro4 { }; - root_numpy = callPackage ../development/python-modules/root_numpy { }; - rootpy = callPackage ../development/python-modules/rootpy { }; rope = callPackage ../development/python-modules/rope { }; From ba3cf09788b7e4232929ed7d9976ab5f326117c6 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 14 Dec 2019 12:07:29 -0500 Subject: [PATCH 2/2] pythonPackages.rootpy: remove --- .../python-modules/rootpy/default.nix | 30 ------------------- pkgs/top-level/python-packages.nix | 2 -- 2 files changed, 32 deletions(-) delete mode 100644 pkgs/development/python-modules/rootpy/default.nix diff --git a/pkgs/development/python-modules/rootpy/default.nix b/pkgs/development/python-modules/rootpy/default.nix deleted file mode 100644 index 2478f6bfea35..000000000000 --- a/pkgs/development/python-modules/rootpy/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, fetchPypi, isPy3k, buildPythonPackage, numpy, matplotlib, root, tables, pytest }: - -buildPythonPackage rec { - pname = "rootpy"; - version = "1.0.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "0zp2bh87l3f0shiqslbvfmavfdj8m80y8fsrz8rsi5pzqj7zr1bx"; - }; - - disabled = isPy3k; - - propagatedBuildInputs = [ matplotlib numpy root tables ]; - - checkInputs = [ pytest ]; - checkPhase = '' - # tests fail with /homeless-shelter - export HOME=$PWD - # skip problematic tests - py.test rootpy -k "not test_stl and not test_cpp and not test_xrootd_glob_single and not test_xrootd_glob_multiple" - ''; - - meta = with lib; { - homepage = http://www.rootpy.org; - license = licenses.bsd3; - description = "Pythonic interface to the ROOT framework"; - maintainers = with maintainers; [ veprbl ]; - }; -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4961a1dd7822..159b4842f1fa 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5044,8 +5044,6 @@ in { Pyro4 = callPackage ../development/python-modules/pyro4 { }; - rootpy = callPackage ../development/python-modules/rootpy { }; - rope = callPackage ../development/python-modules/rope { }; ropper = callPackage ../development/python-modules/ropper { };