diff --git a/pkgs/development/python-modules/es-client/default.nix b/pkgs/development/python-modules/es-client/default.nix index da67670cc4ea..1f02da027f90 100644 --- a/pkgs/development/python-modules/es-client/default.nix +++ b/pkgs/development/python-modules/es-client/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, certifi, click, + cryptography, dotmap, ecs-logging, elastic-transport, @@ -15,13 +16,13 @@ pythonOlder, pyyaml, requests, - six, + tiered-debug, voluptuous, }: buildPythonPackage rec { pname = "es-client"; - version = "8.17.4"; + version = "8.18.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -30,7 +31,7 @@ buildPythonPackage rec { owner = "untergeek"; repo = "es_client"; tag = "v${version}"; - hash = "sha256-43LB0QceljuS3k+yYtJCbJsstsFr3d2h2Gnjal2HcdQ="; + hash = "sha256-siB17xVRS/eeKOsJcWdh4foOHXbeV8wwRclXDHodADM="; }; pythonRelaxDeps = true; @@ -40,12 +41,13 @@ buildPythonPackage rec { dependencies = [ certifi click + cryptography dotmap ecs-logging elastic-transport elasticsearch8 pyyaml - six + tiered-debug voluptuous ]; diff --git a/pkgs/development/python-modules/tiered-debug/default.nix b/pkgs/development/python-modules/tiered-debug/default.nix new file mode 100644 index 000000000000..5a3bef576477 --- /dev/null +++ b/pkgs/development/python-modules/tiered-debug/default.nix @@ -0,0 +1,44 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hatchling, + pytestCheckHook, + pytest-cov-stub, +}: + +buildPythonPackage rec { + pname = "tiered-debug"; + version = "1.3.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "untergeek"; + repo = "tiered-debug"; + tag = "v${version}"; + hash = "sha256-2mThiuJUX+N5qIOXpdFOuIa+kBGYzbZzCeaAfEz3Iy0="; + }; + + build-system = [ hatchling ]; + + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; + + pythonImportsCheck = [ "tiered_debug" ]; + + disabledTests = [ + # AssertionError + "test_add_handler" + "test_log_with_default_stacklevel" + ]; + + meta = { + description = "Python logging helper module that allows for multiple tiers of debug logging"; + homepage = "https://github.com/untergeek/tiered-debug"; + changelog = "https://github.com/untergeek/tiered-debug/releases/tag/${src.tag}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 037b08734c75..e664bba7ddd9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18047,6 +18047,8 @@ self: super: with self; { tidylib = callPackage ../development/python-modules/pytidylib { }; + tiered-debug = callPackage ../development/python-modules/tiered-debug { }; + tifffile = callPackage ../development/python-modules/tifffile { }; tika = callPackage ../development/python-modules/tika { };