From 73dea7fb5646122d8db3357dd03286696bd74c4a Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Fri, 2 Dec 2022 16:11:51 -0800 Subject: [PATCH] python27Packages.unittest: remove completely --- .../python2-modules/contextlib2/default.nix | 4 +- .../python2-modules/s3transfer/default.nix | 2 - .../python2-modules/unittest2/default.nix | 37 ------------------- pkgs/top-level/python2-packages.nix | 2 - 4 files changed, 2 insertions(+), 43 deletions(-) delete mode 100644 pkgs/development/python2-modules/unittest2/default.nix diff --git a/pkgs/development/python2-modules/contextlib2/default.nix b/pkgs/development/python2-modules/contextlib2/default.nix index 38d9fb696e2..063039448fe 100644 --- a/pkgs/development/python2-modules/contextlib2/default.nix +++ b/pkgs/development/python2-modules/contextlib2/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, unittest2 }: buildPythonPackage rec { @@ -13,7 +12,8 @@ buildPythonPackage rec { sha256 = "01f490098c18b19d2bd5bb5dc445b2054d2fa97f09a4280ba2c5f3c394c8162e"; }; - checkInputs = [ unittest2 ]; + # requires unittest2, which has been removed + doCheck = false; meta = { description = "Backports and enhancements for the contextlib module"; diff --git a/pkgs/development/python2-modules/s3transfer/default.nix b/pkgs/development/python2-modules/s3transfer/default.nix index 8cfd324f00a..4fd0fe346ad 100644 --- a/pkgs/development/python2-modules/s3transfer/default.nix +++ b/pkgs/development/python2-modules/s3transfer/default.nix @@ -7,7 +7,6 @@ , nose , coverage , wheel -, unittest2 , botocore , futures ? null }: @@ -32,7 +31,6 @@ buildPythonPackage rec { nose coverage wheel - unittest2 ]; checkPhase = '' diff --git a/pkgs/development/python2-modules/unittest2/default.nix b/pkgs/development/python2-modules/unittest2/default.nix deleted file mode 100644 index 3eeaeaba1fd..00000000000 --- a/pkgs/development/python2-modules/unittest2/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, six -, traceback2 -}: - -buildPythonPackage rec { - version = "1.1.0"; - pname = "unittest2"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-IogqDkGMKE4fcYqCKzsCKUTVPS2QjhaQsxmp0+ssBXk="; - }; - - 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 lib; { - description = "A backport of the new features added to the unittest testing framework"; - homepage = "https://pypi.org/project/unittest2/"; - license = licenses.bsd0; - }; -} diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 6cc20feb86e..3d970d8bc4b 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -143,8 +143,6 @@ with self; with super; { typing = callPackage ../development/python2-modules/typing { }; - unittest2 = callPackage ../development/python2-modules/unittest2 { }; - zeek = disabled super.zeek; zipp = callPackage ../development/python2-modules/zipp { };