diff --git a/pkgs/development/python-modules/nose-parameterized/default.nix b/pkgs/development/python-modules/nose-parameterized/default.nix index 3c7cd077cdc..77b540fdef0 100644 --- a/pkgs/development/python-modules/nose-parameterized/default.nix +++ b/pkgs/development/python-modules/nose-parameterized/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchPypi, buildPythonPackage, nose, six, glibcLocales, isPy3k }: +{ fetchPypi, parameterized }: -buildPythonPackage rec { +parameterized.overrideAttrs (o: rec { pname = "nose-parameterized"; version = "0.6.0"; @@ -8,20 +8,4 @@ buildPythonPackage rec { inherit pname version; sha256 = "1khlabgib4161vn6alxsjaa8javriywgx9vydddi659gp9x6fpnk"; }; - - # Tests require some python3-isms but code works without. - doCheck = isPy3k; - - buildInputs = [ nose glibcLocales ]; - propagatedBuildInputs = [ six ]; - - checkPhase = '' - LC_ALL="en_US.UTF-8" nosetests -v - ''; - - meta = with stdenv.lib; { - description = "Parameterized testing with any Python test framework"; - homepage = https://pypi.python.org/pypi/nose-parameterized; - license = licenses.bsd3; - }; -} +}) diff --git a/pkgs/development/python-modules/parameterized/default.nix b/pkgs/development/python-modules/parameterized/default.nix new file mode 100644 index 00000000000..14b41fe950b --- /dev/null +++ b/pkgs/development/python-modules/parameterized/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchPypi, buildPythonPackage, nose, six, glibcLocales, isPy3k }: + +buildPythonPackage rec { + pname = "parameterized"; + version = "0.6.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1qj1939shm48d9ql6fm1nrdy4p7sdyj8clz1szh5swwpf1qqxxfa"; + }; + + # Tests require some python3-isms but code works without. + doCheck = isPy3k; + + checkInputs = [ nose glibcLocales ]; + propagatedBuildInputs = [ six ]; + + checkPhase = '' + LC_ALL="en_US.UTF-8" nosetests -v + ''; + + meta = with stdenv.lib; { + description = "Parameterized testing with any Python test framework"; + homepage = https://pypi.python.org/pypi/parameterized; + license = licenses.bsd3; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7a279d96591..b958d217e3c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3839,7 +3839,8 @@ in { }; }); - nose-parameterized = callPackage ../development/python-modules/nose-parameterized {}; + nose-parameterized = warn "Warning: `nose-parameterized` is deprecated! Use `parameterized` instead." + (callPackage ../development/python-modules/nose-parameterized {}); neurotools = buildPythonPackage (rec { name = "NeuroTools-${version}"; @@ -12397,6 +12398,8 @@ in { }; }; + parameterized = callPackage ../development/python-modules/parameterized { }; + paramz = callPackage ../development/python-modules/paramz { }; parsel = buildPythonPackage rec {