From 56a016bd77470720a56ae2cb2b6fca5fa75f15c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 15 Nov 2022 23:58:44 +0100 Subject: [PATCH 1/2] python310Packages.smpplib: use pytestCheckHook, remove tox requirement --- pkgs/development/python-modules/smpplib/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/smpplib/default.nix b/pkgs/development/python-modules/smpplib/default.nix index 179ab7ce1bfc..474120bcd872 100644 --- a/pkgs/development/python-modules/smpplib/default.nix +++ b/pkgs/development/python-modules/smpplib/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, lib, python, six, tox, mock, pytest }: +{ buildPythonPackage, fetchPypi, lib, python, six, mock, pytestCheckHook }: buildPythonPackage rec { pname = "smpplib"; @@ -10,11 +10,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ six ]; - checkInputs = [ tox mock pytest ]; - - checkPhase = '' - pytest - ''; + checkInputs = [ mock pytestCheckHook ]; postInstall = '' rm -rf $out/${python.sitePackages}/tests From f08f8825fb0f688a990aa8bd23b73fa60fa766a7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 19 Nov 2022 11:27:49 +0100 Subject: [PATCH 2/2] python310Packages.smpplib: pythonImportsCheck --- .../python-modules/smpplib/default.nix | 25 ++++++++++++++++--- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/smpplib/default.nix b/pkgs/development/python-modules/smpplib/default.nix index 474120bcd872..a71d3d6bd3d4 100644 --- a/pkgs/development/python-modules/smpplib/default.nix +++ b/pkgs/development/python-modules/smpplib/default.nix @@ -1,4 +1,11 @@ -{ buildPythonPackage, fetchPypi, lib, python, six, mock, pytestCheckHook }: +{ lib +, buildPythonPackage +, fetchPypi +, python +, six +, mock +, pytestCheckHook +}: buildPythonPackage rec { pname = "smpplib"; @@ -9,17 +16,27 @@ buildPythonPackage rec { sha256 = "c0b01947b47e404f42ccb59e906b6e4eb507963c971d59b44350db0f29c76166"; }; - propagatedBuildInputs = [ six ]; - checkInputs = [ mock pytestCheckHook ]; + propagatedBuildInputs = [ + six + ]; + + checkInputs = [ + mock + pytestCheckHook + ]; postInstall = '' rm -rf $out/${python.sitePackages}/tests ''; + pythonImportsCheck = [ + "smpplib" + ]; + meta = with lib; { description = "SMPP library for Python"; homepage = "https://github.com/python-smpplib/python-smpplib"; license = licenses.lgpl3Plus; - maintainers = [ maintainers.globin ]; + maintainers = with maintainers; [ globin ]; }; }