python{27,310}Packages.unittest2: move to python2-modules

This commit is contained in:
Theodore Ni 2022-12-01 11:09:23 -08:00
parent a061ba34b1
commit de0f03b56d
No known key found for this signature in database
GPG Key ID: 48B67583BDDD4474
6 changed files with 4 additions and 28 deletions

View File

@ -5,7 +5,6 @@
, pbr
, python-mimeparse
, extras
, unittest2
, traceback2
, testscenarios
}:

View File

@ -1,19 +0,0 @@
diff --git a/unittest2/compatibility.py b/unittest2/compatibility.py
index 9e5f1a5..473957c 100644
--- a/unittest2/compatibility.py
+++ b/unittest2/compatibility.py
@@ -1,4 +1,5 @@
import collections
+import collections.abc
import os
import sys
@@ -140,7 +141,7 @@ except ImportError:
### ChainMap (helper for configparser and string.Template)
########################################################################
-class ChainMap(collections.MutableMapping):
+class ChainMap(collections.abc.MutableMapping):
''' A ChainMap groups multiple dicts (or other mappings) together
to create a single, updateable view.

View File

@ -3,7 +3,6 @@
, fetchPypi
, six
, traceback2
, pythonAtLeast
}:
buildPythonPackage rec {
@ -12,13 +11,9 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
sha256 = "0y855kmx7a8rnf81d3lh5lyxai1908xjp0laf4glwa4c8472m212";
hash = "sha256-IogqDkGMKE4fcYqCKzsCKUTVPS2QjhaQsxmp0+ssBXk=";
};
patches = lib.optionals (pythonAtLeast "3.7") [
./collections-compat.patch
];
propagatedBuildInputs = [ six traceback2 ];
# 1.0.0 and up create a circle dependency with traceback2/pbr

View File

@ -216,6 +216,7 @@ mapAliases ({
tvnamer = throw "tvnamer was moved to pkgs.tvnamer"; # added 2021-07-05
types-cryptography = throw "types-cryptography has been removed because it is obsolete since cryptography version 3.4.4."; # added 2022-05-30
types-paramiko = throw "types-paramiko has been removed because it was unused."; # added 2022-05-30
unittest2 = throw "unittest2 has been removed as it's a backport of unittest that's unmaintained and not needed beyond Python 3.4."; # added 2022-12-01
Wand = wand; # added 2022-11-13
WazeRouteCalculator = wazeroutecalculator; # added 2021-09-29
weakrefmethod = throw "weakrefmethod was removed since it's not needed in Python >= 3.4"; # added 2022-12-01

View File

@ -11589,8 +11589,6 @@ self: super: with self; {
units = callPackage ../development/python-modules/units { };
unittest2 = callPackage ../development/python-modules/unittest2 { };
unittest-data-provider = callPackage ../development/python-modules/unittest-data-provider { };
unittest-xml-reporting = callPackage ../development/python-modules/unittest-xml-reporting { };

View File

@ -143,6 +143,8 @@ 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 { };