From 6817f26c3560e7f31bc21319f3fb1b99c5d2dc92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 1 Nov 2021 21:58:01 +0100
Subject: [PATCH] python39Packages.ruamel-base: normalise name, adopt

---
 .../{ruamel_base => ruamel-base}/default.nix         | 12 +++++++++---
 pkgs/development/python-modules/ruamel_yaml/0.16.nix |  4 ++--
 .../python-modules/ruamel_yaml/default.nix           |  4 ++--
 pkgs/top-level/python-aliases.nix                    |  1 +
 pkgs/top-level/python-packages.nix                   |  3 +--
 5 files changed, 15 insertions(+), 9 deletions(-)
 rename pkgs/development/python-modules/{ruamel_base => ruamel-base}/default.nix (63%)

diff --git a/pkgs/development/python-modules/ruamel_base/default.nix b/pkgs/development/python-modules/ruamel-base/default.nix
similarity index 63%
rename from pkgs/development/python-modules/ruamel_base/default.nix
rename to pkgs/development/python-modules/ruamel-base/default.nix
index 1f829bb4e0ba..2db8a335e895 100644
--- a/pkgs/development/python-modules/ruamel_base/default.nix
+++ b/pkgs/development/python-modules/ruamel-base/default.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 ];
   };
-
 }
diff --git a/pkgs/development/python-modules/ruamel_yaml/0.16.nix b/pkgs/development/python-modules/ruamel_yaml/0.16.nix
index b4734d0a53cc..f2d68f519e4b 100644
--- a/pkgs/development/python-modules/ruamel_yaml/0.16.nix
+++ b/pkgs/development/python-modules/ruamel_yaml/0.16.nix
@@ -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;
 
diff --git a/pkgs/development/python-modules/ruamel_yaml/default.nix b/pkgs/development/python-modules/ruamel_yaml/default.nix
index eeb200b57b47..84f139619468 100644
--- a/pkgs/development/python-modules/ruamel_yaml/default.nix
+++ b/pkgs/development/python-modules/ruamel_yaml/default.nix
@@ -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 = [
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 9197d3f0d54c..88c60c9da149 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -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
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d476b718e25d..e9adf60c6818 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -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 { };