From 2434ed121a8bb656a2fa16920993833bd82c51e9 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 5 Nov 2023 14:48:36 +0900 Subject: [PATCH 1/2] python311Packages.multi-key-dict: rename from multi_key_dict --- .../{multi_key_dict => multi-key-dict}/default.nix | 5 +++-- pkgs/development/python-modules/python-jenkins/default.nix | 4 ++-- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) rename pkgs/development/python-modules/{multi_key_dict => multi-key-dict}/default.nix (81%) diff --git a/pkgs/development/python-modules/multi_key_dict/default.nix b/pkgs/development/python-modules/multi-key-dict/default.nix similarity index 81% rename from pkgs/development/python-modules/multi_key_dict/default.nix rename to pkgs/development/python-modules/multi-key-dict/default.nix index cb539e4dd90f..0a53aad3c653 100644 --- a/pkgs/development/python-modules/multi_key_dict/default.nix +++ b/pkgs/development/python-modules/multi-key-dict/default.nix @@ -4,11 +4,12 @@ }: buildPythonPackage rec { - pname = "multi_key_dict"; + pname = "multi-key-dict"; version = "2.0.3"; src = fetchPypi { - inherit pname version; + pname = "multi_key_dict"; + inherit version; sha256 = "17lkx4rf4waglwbhc31aak0f28c63zl3gx5k5i1iq2m3gb0xxsyy"; }; diff --git a/pkgs/development/python-modules/python-jenkins/default.nix b/pkgs/development/python-modules/python-jenkins/default.nix index af0671279ab1..674ca539c701 100644 --- a/pkgs/development/python-modules/python-jenkins/default.nix +++ b/pkgs/development/python-modules/python-jenkins/default.nix @@ -7,7 +7,7 @@ , pyyaml , setuptools , six -, multi_key_dict +, multi-key-dict , testscenarios , requests , requests-mock @@ -40,7 +40,7 @@ buildPythonPackage rec { ]; buildInputs = [ mock ]; - propagatedBuildInputs = [ pbr pyyaml setuptools six multi_key_dict requests ]; + propagatedBuildInputs = [ pbr pyyaml setuptools six multi-key-dict requests ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 39577ac30411..f75a8bca043a 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -238,6 +238,7 @@ mapAliases ({ mistune_2_0 = mistune; # added 2022-08-12 mox = throw "mox was removed because it is unmaintained"; # added 2023-02-21 mrkd = throw "mrkd has been promoted to a top-level attribute"; # added 2023-08-01 + multi_key_dict = multi-key-dict; # added 2023-11-05 mutmut = throw "mutmut has been promoted to a top-level attribute"; # added 2022-10-02 net2grid = gridnet; # add 2022-04-22 nghttp2 = throw "in 1.52.0 removed deprecated python bindings."; # added 2023-06-08 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0bd217ad4ee1..e2473d1fbcbe 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7095,7 +7095,7 @@ self: super: with self; { multidict = callPackage ../development/python-modules/multidict { }; - multi_key_dict = callPackage ../development/python-modules/multi_key_dict { }; + multi-key-dict = callPackage ../development/python-modules/multi-key-dict { }; multimethod = callPackage ../development/python-modules/multimethod { }; From 0bd996ce96a2696da9f8c4c9da7690bacad8031e Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 5 Nov 2023 14:51:42 +0900 Subject: [PATCH 2/2] python311Packages.multi-key-dict: refactor --- .../python-modules/multi-key-dict/default.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/multi-key-dict/default.nix b/pkgs/development/python-modules/multi-key-dict/default.nix index 0a53aad3c653..c959f2e8f2ec 100644 --- a/pkgs/development/python-modules/multi-key-dict/default.nix +++ b/pkgs/development/python-modules/multi-key-dict/default.nix @@ -1,22 +1,34 @@ { lib , buildPythonPackage , fetchPypi +, setuptools }: buildPythonPackage rec { pname = "multi-key-dict"; version = "2.0.3"; + pyproject = true; src = fetchPypi { pname = "multi_key_dict"; inherit version; - sha256 = "17lkx4rf4waglwbhc31aak0f28c63zl3gx5k5i1iq2m3gb0xxsyy"; + hash = "sha256-3uvewXqjChxDLLP0N+gfhiHhwFQqDAYXp09x4jLpk54="; }; + nativeBuildInputs = [ + setuptools + ]; + + # upstream has no tests + doCheck = false; + + pythonImportsCheck = [ + "multi_key_dict" + ]; + meta = with lib; { description = "multi_key_dict"; homepage = "https://github.com/formiaczek/multi_key_dict"; license = licenses.mit; }; - }