python39Packages.ruamel_yaml: remove python2 compatility from python3 file, add SuperSandro2000 as maintainer
This commit is contained in:
parent
3a0f6d4e3d
commit
418bbe4a6c
2 changed files with 7 additions and 12 deletions
|
@ -2,9 +2,9 @@
|
|||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, ruamel_base
|
||||
, ruamel_ordereddict ? null
|
||||
, ruamel_ordereddict
|
||||
, ruamel_yaml_clib ? null
|
||||
, isPy3k
|
||||
, isPy27
|
||||
, isPyPy
|
||||
}:
|
||||
|
||||
|
@ -21,11 +21,11 @@ buildPythonPackage rec {
|
|||
doCheck = false;
|
||||
|
||||
propagatedBuildInputs = [ ruamel_base ]
|
||||
++ lib.optional (!isPy3k) ruamel_ordereddict
|
||||
++ lib.optional isPy27 ruamel_ordereddict
|
||||
++ lib.optional (!isPyPy) ruamel_yaml_clib;
|
||||
|
||||
# causes namespace clash on py27
|
||||
dontUsePythonImportsCheck = !isPy3k;
|
||||
dontUsePythonImportsCheck = isPy27;
|
||||
pythonImportsCheck = [
|
||||
"ruamel.yaml"
|
||||
"ruamel.base"
|
||||
|
@ -35,6 +35,6 @@ buildPythonPackage rec {
|
|||
description = "YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order";
|
||||
homepage = "https://sourceforge.net/projects/ruamel-yaml/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ SuperSandro2000 ];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
@ -2,9 +2,7 @@
|
|||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, ruamel_base
|
||||
, ruamel_ordereddict ? null
|
||||
, ruamel_yaml_clib ? null
|
||||
, isPy3k
|
||||
, ruamel_yaml_clib
|
||||
, isPyPy
|
||||
}:
|
||||
|
||||
|
@ -21,11 +19,8 @@ buildPythonPackage rec {
|
|||
doCheck = false;
|
||||
|
||||
propagatedBuildInputs = [ ruamel_base ]
|
||||
++ lib.optional (!isPy3k) ruamel_ordereddict
|
||||
++ lib.optional (!isPyPy) ruamel_yaml_clib;
|
||||
|
||||
# causes namespace clash on py27
|
||||
dontUsePythonImportsCheck = !isPy3k;
|
||||
pythonImportsCheck = [
|
||||
"ruamel.yaml"
|
||||
"ruamel.base"
|
||||
|
@ -35,6 +30,6 @@ buildPythonPackage rec {
|
|||
description = "YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order";
|
||||
homepage = "https://sourceforge.net/projects/ruamel-yaml/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ SuperSandro2000 ];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue