From cdb49c94adb784d1ab0f171ef06cdc125fbc075c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 May 2024 15:08:03 +0200 Subject: [PATCH 1/3] python311Packages.py-zabbix: format with nixfmt --- .../python-modules/py-zabbix/default.nix | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/py-zabbix/default.nix b/pkgs/development/python-modules/py-zabbix/default.nix index b39a706c6538..c34ab3cbaa1a 100644 --- a/pkgs/development/python-modules/py-zabbix/default.nix +++ b/pkgs/development/python-modules/py-zabbix/default.nix @@ -1,9 +1,10 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, fetchpatch -, pytestCheckHook -, pythonOlder +{ + lib, + buildPythonPackage, + fetchFromGitHub, + fetchpatch, + pytestCheckHook, + pythonOlder, }: buildPythonPackage rec { @@ -29,13 +30,9 @@ buildPythonPackage rec { }) ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "pyzabbix" - ]; + pythonImportsCheck = [ "pyzabbix" ]; meta = with lib; { description = "Python module to interact with Zabbix"; From fe80abc3f536badb67af5212c0bc10669436d40f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 May 2024 15:10:31 +0200 Subject: [PATCH 2/3] python311Packages.py-zabbix: refactor --- pkgs/development/python-modules/py-zabbix/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/py-zabbix/default.nix b/pkgs/development/python-modules/py-zabbix/default.nix index c34ab3cbaa1a..96508a84de15 100644 --- a/pkgs/development/python-modules/py-zabbix/default.nix +++ b/pkgs/development/python-modules/py-zabbix/default.nix @@ -5,12 +5,13 @@ fetchpatch, pytestCheckHook, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "py-zabbix"; version = "1.1.7"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -30,6 +31,8 @@ buildPythonPackage rec { }) ]; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "pyzabbix" ]; @@ -37,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to interact with Zabbix"; homepage = "https://github.com/adubkov/py-zabbix"; + changelog = "https://github.com/adubkov/py-zabbix/releases/tag/${version}"; license = licenses.gpl2Only; maintainers = with maintainers; [ fab ]; }; From e6f807fc163271955436e095f60c12962fd975eb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 May 2024 15:11:59 +0200 Subject: [PATCH 3/3] python312Packages.py-zabbix: disable failing tests on Python 3.12 --- pkgs/development/python-modules/py-zabbix/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/py-zabbix/default.nix b/pkgs/development/python-modules/py-zabbix/default.nix index 96508a84de15..e9251892bd07 100644 --- a/pkgs/development/python-modules/py-zabbix/default.nix +++ b/pkgs/development/python-modules/py-zabbix/default.nix @@ -4,6 +4,7 @@ fetchFromGitHub, fetchpatch, pytestCheckHook, + pythonAtLeast, pythonOlder, setuptools, }: @@ -37,6 +38,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "pyzabbix" ]; + disabledTests = lib.optionals (pythonAtLeast "3.12") [ + # AttributeError: 'RawConfigParser' object has no attribute 'readfp' + "config" + ]; + meta = with lib; { description = "Python module to interact with Zabbix"; homepage = "https://github.com/adubkov/py-zabbix";