Merge pull request #205615 from fabaff/python-benedict-bump

python310Packages.python-benedict: 0.25.4 -> 0.27.1 

3 files changed, 65 insertions, 6 deletions

diff --git a/pkgs/development/python-modules/python-benedict/default.nix b/pkgs/development/python-modules/python-benedict/default.nix
index 19f07ccc0394..a85c74b9f6d2 100644
--- a/pkgs/development/python-modules/python-benedict/default.nix
+++ b/pkgs/development/python-modules/python-benedict/default.nix
@@ -1,26 +1,30 @@
 { lib
-, aiohttp
+, boto3
 , buildPythonPackage
 , fetchFromGitHub
 , ftfy
 , mailchecker
+, openpyxl
 , orjson
 , phonenumbers
 , pytestCheckHook
 , python-dateutil
+, python-decouple
 , python-fsutil
-, pythonOlder
 , python-slugify
+, pythonOlder
+, pythonRelaxDepsHook
 , pyyaml
 , requests
 , six
 , toml
+, xlrd
 , xmltodict
 }:
 
 buildPythonPackage rec {
   pname = "python-benedict";
-  version = "0.25.4";
+  version = "0.27.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -29,25 +33,37 @@ buildPythonPackage rec {
     owner = "fabiocaccamo";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-q7aQW4XRlKp+X1iItHVEsHEjkl2DU9QG0eMrcuq+rc4=";
+    hash = "sha256-L1lgP/Lpy+3koT93Z/H27SbraOHXBm1pxx+Ie6Z2AE4=";
   };
 
+  nativeBuildInputs = [
+    pythonRelaxDepsHook
+  ];
+
+  pythonRelaxDeps = [
+    "boto3"
+  ];
+
   propagatedBuildInputs = [
+    boto3
+    ftfy
     mailchecker
+    openpyxl
     phonenumbers
     python-dateutil
     python-fsutil
     python-slugify
     pyyaml
-    ftfy
-    orjson
     requests
     toml
+    xlrd
     xmltodict
   ];
 
   checkInputs = [
+    orjson
     pytestCheckHook
+    python-decouple
     six
   ];
 
@@ -59,6 +75,7 @@ buildPythonPackage rec {
     "test_from_plist_with_valid_url_valid_content"
     "test_from_query_string_with_valid_url_valid_content"
     "test_from_toml_with_valid_url_valid_content"
+    "test_from_xls_with_valid_url_valid_content"
     "test_from_xml_with_valid_url_valid_content"
     "test_from_yaml_with_valid_url_valid_content"
   ];
@@ -70,6 +87,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Module with keylist/keypath support";
     homepage = "https://github.com/fabiocaccamo/python-benedict";
+    changelog = "https://github.com/fabiocaccamo/python-benedict/blob/${version}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };
diff --git a/pkgs/development/python-modules/python-decouple/default.nix b/pkgs/development/python-modules/python-decouple/default.nix
new file mode 100644
index 000000000000..99f202192294
--- /dev/null
+++ b/pkgs/development/python-modules/python-decouple/default.nix
@@ -0,0 +1,39 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, mock
+, pytestCheckHook
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+  pname = "python-decouple";
+  version = "3.6";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "HBNetwork";
+    repo = pname;
+    rev = "refs/tags/v${version}";
+    hash = "sha256-Ll0MZb4FaNFF/jvCfj4TkuoAi4m448KaOU3ykvKPbSo=";
+  };
+
+  checkInputs = [
+    mock
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "decouple"
+  ];
+
+  meta = with lib; {
+    description = "Module to handle code and condifuration";
+    homepage = "https://github.com/HBNetwork/python-decouple";
+    changelog = "https://github.com/HBNetwork/python-decouple/blob/v${version}/CHANGELOG.md";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index de076425e89b..ffe00c954992 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9020,6 +9020,8 @@ self: super: with self; {
 
   python-dbusmock = callPackage ../development/python-modules/python-dbusmock { };
 
+  python-decouple = callPackage ../development/python-modules/python-decouple { };
+
   pythondialog = callPackage ../development/python-modules/pythondialog { };
 
   python-didl-lite = callPackage ../development/python-modules/python-didl-lite { };