From a81adf0398d3515ce1cd90ab1b73eddbb2b864b1 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 28 Oct 2018 12:36:41 -0400 Subject: [PATCH] pythonPackages.unittest2: refactor move to python-modules --- .../python-modules/unittest2/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 30 +-------------- 2 files changed, 39 insertions(+), 29 deletions(-) create mode 100644 pkgs/development/python-modules/unittest2/default.nix diff --git a/pkgs/development/python-modules/unittest2/default.nix b/pkgs/development/python-modules/unittest2/default.nix new file mode 100644 index 00000000000..85ca7157e12 --- /dev/null +++ b/pkgs/development/python-modules/unittest2/default.nix @@ -0,0 +1,38 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, six +, traceback2 +}: + +buildPythonPackage rec { + version = "1.1.0"; + pname = "unittest2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0y855kmx7a8rnf81d3lh5lyxai1908xjp0laf4glwa4c8472m212"; + }; + + propagatedBuildInputs = [ six traceback2 ]; + + # # 1.0.0 and up create a circle dependency with traceback2/pbr + doCheck = false; + + postPatch = '' + # argparse is needed for python < 2.7, which we do not support anymore. + substituteInPlace setup.py --replace "argparse" "" + + # # fixes a transient error when collecting tests, see https://bugs.launchpad.net/python-neutronclient/+bug/1508547 + sed -i '510i\ return None, False' unittest2/loader.py + # https://github.com/pypa/packaging/pull/36 + sed -i 's/version=VERSION/version=str(VERSION)/' setup.py + ''; + + meta = with stdenv.lib; { + description = "A backport of the new features added to the unittest testing framework"; + homepage = https://pypi.python.org/pypi/unittest2; + license = licenses.bsd0; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 991fdd31357..3ce0758943e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4045,35 +4045,7 @@ in { unicodecsv = callPackage ../development/python-modules/unicodecsv { }; - unittest2 = buildPythonPackage rec { - version = "1.1.0"; - name = "unittest2-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/u/unittest2/unittest2-${version}.tar.gz"; - sha256 = "0y855kmx7a8rnf81d3lh5lyxai1908xjp0laf4glwa4c8472m212"; - }; - - # # 1.0.0 and up create a circle dependency with traceback2/pbr - doCheck = false; - - postPatch = '' - # argparse is needed for python < 2.7, which we do not support anymore. - substituteInPlace setup.py --replace "argparse" "" - - # # fixes a transient error when collecting tests, see https://bugs.launchpad.net/python-neutronclient/+bug/1508547 - sed -i '510i\ return None, False' unittest2/loader.py - # https://github.com/pypa/packaging/pull/36 - sed -i 's/version=VERSION/version=str(VERSION)/' setup.py - ''; - - propagatedBuildInputs = with self; [ six traceback2 ]; - - meta = { - description = "A backport of the new features added to the unittest testing framework"; - homepage = https://pypi.python.org/pypi/unittest2; - }; - }; + unittest2 = callPackage ../development/python-modules/unittest2 { }; unittest-xml-reporting = callPackage ../development/python-modules/unittest-xml-reporting { };