python312Packages.dotty-dict: refactor (#369725)

pkgs/development/python-modules/dotty-dict/default.nix

@@ -1,27 +1,34 @@
 {
   lib,
-  fetchPypi,
+  fetchFromGitHub,
   buildPythonPackage,
-  setuptools-scm,
+  poetry-core,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
-  pname = "dotty_dict";
+  pname = "dotty-dict";
   version = "1.3.1";
+  pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-SwFuA7iuJlU5dXpT66JLm/2lBvuU+84L7oQ8bwVUGhU=";
+  src = fetchFromGitHub {
+    owner = "pawelzny";
+    repo = "dotty_dict";
+    tag = "v${version}";
+    hash = "sha256-kY7o9wgfsV7oc5twOeuhG47C0Js6JzCt02S9Sd8dSGc=";
   };
 
-  nativeBuildInputs = [ setuptools-scm ];
+  build-system = [ poetry-core ];
 
-  doCheck = false;
+  pythonImportsCheck = [ "dotty_dict" ];
 
-  meta = with lib; {
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  meta = {
     description = "Dictionary wrapper for quick access to deeply nested keys";
     homepage = "https://dotty-dict.readthedocs.io";
-    license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    changelog = "https://github.com/pawelzny/dotty_dict/releases/tag/${src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ];
   };
 }

pkgs/development/python-modules/qmk-dotty-dict/default.nix

@@ -1,35 +0,0 @@
-{
-  buildPythonPackage,
-  fetchFromGitHub,
-  lib,
-  poetry-core,
-}:
-
-buildPythonPackage rec {
-  pname = "qmk_dotty_dict";
-  version = "1.3.1";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "pawelzny";
-    repo = "dotty_dict";
-    tag = "v${version}";
-    hash = "sha256-kY7o9wgfsV7oc5twOeuhG47C0Js6JzCt02S9Sd8dSGc=";
-  };
-
-  nativeBuildInputs = [ poetry-core ];
-
-  doCheck = false;
-
-  meta = with lib; {
-    homepage = "https://github.com/pawelzny/dotty_dict";
-    description = "Dictionary wrapper for quick access to deeply nested keys";
-    longDescription = ''
-      This is a version of dotty-dict by QMK (https://qmk.fm) since the original
-      dotty-dict published to pypi has non-ASCII characters that breaks with
-      some non-UTF8 locale settings.
-    '';
-    license = licenses.mit;
-    maintainers = [ ];
-  };
-}

pkgs/top-level/python-aliases.nix

@@ -584,6 +584,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
   qds-sdk = throw "qds-sdk was removed as it is unmaintained upstream and depends on the removed boto package"; # Added 2024-09-22
   qds_sdk = qds-sdk; # added 2023-10-21
+  qmk-dotty-dict = throw "qmk-dotty-dict has been removed. It is no longer needed since the fixes have been merged into dotty-dict."; # added 2025-01-01
   Quandl = quandl; # added 2023-02-19
   quamash = throw "'quamash' has been removed, since it is unmaintained and broken"; # added 2024-10-17
   querystring_parser = querystring-parser; # added 2024-01-07

pkgs/top-level/python-packages.nix

@@ -13765,8 +13765,6 @@ self: super: with self; {
 
   qutip = callPackage ../development/python-modules/qutip { };
 
-  qmk-dotty-dict = callPackage ../development/python-modules/qmk-dotty-dict { };
-
   pythonqwt = callPackage ../development/python-modules/pythonqwt { };
 
   r2pipe = callPackage ../development/python-modules/r2pipe { };