mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-22 21:18:28 +03:00
python{27,310}Packages.unittest2: move to python2-modules
This commit is contained in:
parent
a061ba34b1
commit
de0f03b56d
@ -5,7 +5,6 @@
|
|||||||
, pbr
|
, pbr
|
||||||
, python-mimeparse
|
, python-mimeparse
|
||||||
, extras
|
, extras
|
||||||
, unittest2
|
|
||||||
, traceback2
|
, traceback2
|
||||||
, testscenarios
|
, testscenarios
|
||||||
}:
|
}:
|
||||||
|
@ -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.
|
|
||||||
|
|
@ -3,7 +3,6 @@
|
|||||||
, fetchPypi
|
, fetchPypi
|
||||||
, six
|
, six
|
||||||
, traceback2
|
, traceback2
|
||||||
, pythonAtLeast
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
@ -12,13 +11,9 @@ buildPythonPackage rec {
|
|||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "0y855kmx7a8rnf81d3lh5lyxai1908xjp0laf4glwa4c8472m212";
|
hash = "sha256-IogqDkGMKE4fcYqCKzsCKUTVPS2QjhaQsxmp0+ssBXk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = lib.optionals (pythonAtLeast "3.7") [
|
|
||||||
./collections-compat.patch
|
|
||||||
];
|
|
||||||
|
|
||||||
propagatedBuildInputs = [ six traceback2 ];
|
propagatedBuildInputs = [ six traceback2 ];
|
||||||
|
|
||||||
# 1.0.0 and up create a circle dependency with traceback2/pbr
|
# 1.0.0 and up create a circle dependency with traceback2/pbr
|
@ -216,6 +216,7 @@ mapAliases ({
|
|||||||
tvnamer = throw "tvnamer was moved to pkgs.tvnamer"; # added 2021-07-05
|
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-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
|
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
|
Wand = wand; # added 2022-11-13
|
||||||
WazeRouteCalculator = wazeroutecalculator; # added 2021-09-29
|
WazeRouteCalculator = wazeroutecalculator; # added 2021-09-29
|
||||||
weakrefmethod = throw "weakrefmethod was removed since it's not needed in Python >= 3.4"; # added 2022-12-01
|
weakrefmethod = throw "weakrefmethod was removed since it's not needed in Python >= 3.4"; # added 2022-12-01
|
||||||
|
@ -11589,8 +11589,6 @@ self: super: with self; {
|
|||||||
|
|
||||||
units = callPackage ../development/python-modules/units { };
|
units = callPackage ../development/python-modules/units { };
|
||||||
|
|
||||||
unittest2 = callPackage ../development/python-modules/unittest2 { };
|
|
||||||
|
|
||||||
unittest-data-provider = callPackage ../development/python-modules/unittest-data-provider { };
|
unittest-data-provider = callPackage ../development/python-modules/unittest-data-provider { };
|
||||||
|
|
||||||
unittest-xml-reporting = callPackage ../development/python-modules/unittest-xml-reporting { };
|
unittest-xml-reporting = callPackage ../development/python-modules/unittest-xml-reporting { };
|
||||||
|
@ -143,6 +143,8 @@ with self; with super; {
|
|||||||
|
|
||||||
typing = callPackage ../development/python2-modules/typing { };
|
typing = callPackage ../development/python2-modules/typing { };
|
||||||
|
|
||||||
|
unittest2 = callPackage ../development/python2-modules/unittest2 { };
|
||||||
|
|
||||||
zeek = disabled super.zeek;
|
zeek = disabled super.zeek;
|
||||||
|
|
||||||
zipp = callPackage ../development/python2-modules/zipp { };
|
zipp = callPackage ../development/python2-modules/zipp { };
|
||||||
|
Loading…
Reference in New Issue
Block a user