python39Packages.ruamel-base: normalise name, adopt

main
Sandro Jäckel 3 years ago
parent b8314a3346
commit 6817f26c35
No known key found for this signature in database
GPG Key ID: 3AF5A43A3EECC2E5
  1. 12
      pkgs/development/python-modules/ruamel-base/default.nix
  2. 4
      pkgs/development/python-modules/ruamel_yaml/0.16.nix
  3. 4
      pkgs/development/python-modules/ruamel_yaml/default.nix
  4. 1
      pkgs/top-level/python-aliases.nix
  5. 3
      pkgs/top-level/python-packages.nix

@ -4,18 +4,24 @@
}:
buildPythonPackage rec {
pname = "ruamel.base";
pname = "ruamel-base";
version = "1.0.0";
src = fetchPypi {
inherit pname version;
pname = "ruamel.base";
inherit version;
sha256 = "1wswxrn4givsm917mfl39rafgadimf1sldpbjdjws00g1wx36hf0";
};
# no tests
doCheck = false;
pythonImportsCheck = [ "ruamel.base" ];
meta = with lib; {
description = "Common routines for ruamel packages";
homepage = "https://sourceforge.net/projects/ruamel-base/";
license = licenses.mit;
maintainers = with maintainers; [ SuperSandro2000 ];
};
}

@ -1,7 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
, ruamel_base
, ruamel-base
, ruamel_ordereddict
, ruamel_yaml_clib ? null
, isPy27
@ -20,7 +20,7 @@ buildPythonPackage rec {
# Tests use relative paths
doCheck = false;
propagatedBuildInputs = [ ruamel_base ]
propagatedBuildInputs = [ ruamel-base ]
++ lib.optional isPy27 ruamel_ordereddict
++ lib.optional (!isPyPy) ruamel_yaml_clib;

@ -1,7 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
, ruamel_base
, ruamel-base
, ruamel_yaml_clib
, isPyPy
}:
@ -18,7 +18,7 @@ buildPythonPackage rec {
# Tests use relative paths
doCheck = false;
propagatedBuildInputs = [ ruamel_base ]
propagatedBuildInputs = [ ruamel-base ]
++ lib.optional (!isPyPy) ruamel_yaml_clib;
pythonImportsCheck = [

@ -79,6 +79,7 @@ mapAliases ({
qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09
requests_toolbelt = requests-toolbelt; # added 2017-09-26
rotate-backups = throw "rotate-backups was removed in favor of the top-level rotate-backups"; # added 2021-07-01
ruamel_base = ruamel-base; # added 2021-11-01
scikitlearn = scikit-learn; # added 2021-07-21
selectors34 = throw "selectors34 has been removed: functionality provided by Python itself; archived by upstream."; # added 2021-06-10
setuptools_scm = setuptools-scm; # added 2021-06-03

@ -8202,8 +8202,7 @@ in {
rtslib = callPackage ../development/python-modules/rtslib { };
ruamel-base = self.ruamel_base;
ruamel_base = callPackage ../development/python-modules/ruamel_base { };
ruamel-base = callPackage ../development/python-modules/ruamel-base { };
ruamel-yaml = self.ruamel_yaml;
ruamel_yaml = callPackage ../development/python-modules/ruamel_yaml { };

Loading…
Cancel
Save