diff --git a/pkgs/development/python-modules/envoy-reader/default.nix b/pkgs/development/python-modules/envoy-reader/default.nix index d72db523a21c..0f2ca79d6411 100644 --- a/pkgs/development/python-modules/envoy-reader/default.nix +++ b/pkgs/development/python-modules/envoy-reader/default.nix @@ -1,30 +1,27 @@ { lib , buildPythonPackage +, envoy-utils , fetchFromGitHub , httpx , pytest-asyncio , pytest-raises -, pytest-runner , pytestCheckHook , respx }: buildPythonPackage rec { pname = "envoy-reader"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "jesserizzo"; repo = "envoy_reader"; rev = version; - sha256 = "0jyrgm7dc6k66c94gadc69a6xsv2b48wn3b3rbpwgbssi5s7iiz6"; + sha256 = "sha256-nPB1Fvb1qwLHeFkXP2jXixD2ZGA09MtS1qXRhYGt0fM="; }; - nativeBuildInputs = [ - pytest-runner - ]; - propagatedBuildInputs = [ + envoy-utils httpx ]; @@ -35,6 +32,11 @@ buildPythonPackage rec { respx ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "pytest-runner>=5.2" "" + ''; + pythonImportsCheck = [ "envoy_reader" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/envoy-utils/default.nix b/pkgs/development/python-modules/envoy-utils/default.nix new file mode 100644 index 000000000000..6f04704a8b5f --- /dev/null +++ b/pkgs/development/python-modules/envoy-utils/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, zeroconf +}: + +buildPythonPackage rec { + pname = "envoy-utils"; + version = "0.0.1"; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + pname = "envoy_utils"; + inherit version; + sha256 = "13zn0d6k2a4nls9vp8cs0w07bgg4138vz18cadjadhm8p6r3bi0c"; + }; + + propagatedBuildInputs = [ + zeroconf + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "envoy_utils" ]; + + meta = with lib; { + description = "Python utilities for the Enphase Envoy"; + homepage = "https://pypi.org/project/envoy-utils/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 924b56765e6d..66b5a83c70f0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2366,6 +2366,8 @@ in { envoy-reader = callPackage ../development/python-modules/envoy-reader { }; + envoy-utils = callPackage ../development/python-modules/envoy-utils { }; + enzyme = callPackage ../development/python-modules/enzyme { }; epc = callPackage ../development/python-modules/epc { };