From 7d5bc724b0b78eb59ebfe2cccb9dd6ffd1271e08 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 24 Jun 2024 18:56:12 +0200 Subject: [PATCH] python312Packages.python-dbusmock: fix tests, use pep517 builder --- .../python-dbusmock/default.nix | 60 ++++++++----------- 1 file changed, 25 insertions(+), 35 deletions(-) diff --git a/pkgs/development/python-modules/python-dbusmock/default.nix b/pkgs/development/python-modules/python-dbusmock/default.nix index 5f0ebb3988e15..9092a49d76903 100644 --- a/pkgs/development/python-modules/python-dbusmock/default.nix +++ b/pkgs/development/python-modules/python-dbusmock/default.nix @@ -2,15 +2,22 @@ lib, buildPythonPackage, fetchFromGitHub, - nose, + runCommand, + + # build-system + setuptools, + setuptools-scm, + + # dependencies + dbus-python, + + # checks dbus, gobject-introspection, - dbus-python, pygobject3, bluez, networkmanager, - setuptools-scm, - runCommand, + pytestCheckHook, }: let @@ -24,7 +31,7 @@ in buildPythonPackage rec { pname = "python-dbusmock"; version = "0.31.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "martinpitt"; @@ -33,9 +40,12 @@ buildPythonPackage rec { hash = "sha256-DdV78o089Jkc7mSsGvlJgVpv8kPpMILo7lC6EbLxkxg="; }; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ + setuptools + setuptools-scm + ]; - propagatedBuildInputs = [ dbus-python ]; + dependencies = [ dbus-python ]; nativeCheckInputs = [ dbus @@ -44,39 +54,19 @@ buildPythonPackage rec { bluez pbap-client networkmanager - nose + pytestCheckHook ]; - # TODO: Get the rest of these tests running? - NOSE_EXCLUDE = lib.concatStringsSep "," [ - "test_bluez4" # NixOS ships BlueZ5 - # These appear to fail because they're expecting to run in an Ubuntu chroot? - "test_everything" # BlueZ5 OBEX - "test_polkitd" - "test_consolekit" - "test_api" - "test_logind" - "test_notification_daemon" - "test_ofono" - "test_gnome_screensaver" - "test_cli" - "test_timedated" - "test_upower" - # needs glib - "test_accounts_service" - # needs dbus-daemon active - "test_systemd" - # Very slow, consider disabling? - # "test_networkmanager" + disabledTests = [ + # wants to call upower, which is a reverse-dependency + "test_dbusmock_test_template" + # Failed to execute program org.TestSystem: No such file or directory + "test_system_service_activation" + "test_session_service_activation" ]; - checkPhase = '' - runHook preCheck - nosetests -v - runHook postCheck - ''; - meta = with lib; { + changelog = "https://github.com/martinpitt/python-dbusmock/releases/tag/${version}"; description = "Mock D-Bus objects for tests"; homepage = "https://github.com/martinpitt/python-dbusmock"; license = licenses.lgpl3Plus;