From 504a0c2c6318821a3e0d9eba3c511c4e74ab3887 Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 10 Jan 2025 23:23:03 +0900 Subject: [PATCH 1/3] python312Packages.ptest: add update-script --- pkgs/development/python-modules/ptest/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/python-modules/ptest/default.nix b/pkgs/development/python-modules/ptest/default.nix index a9772dcb2654..e7bc6618d867 100644 --- a/pkgs/development/python-modules/ptest/default.nix +++ b/pkgs/development/python-modules/ptest/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + nix-update-script, }: buildPythonPackage rec { @@ -16,6 +17,13 @@ buildPythonPackage rec { sha256 = "0v1zpfjagjlvdmgv6d502nmb7s996wadvpzg93i651s64rrlwq4s"; }; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "(.*)-release" + ]; + }; + meta = with lib; { description = "Test classes and test cases using decorators, execute test cases by command line, and get clear reports"; homepage = "https://pypi.python.org/pypi/ptest"; From 7e5d45513255dec33a7c59f5c65a4bf00834025e Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 10 Jan 2025 23:20:23 +0900 Subject: [PATCH 2/3] python312Packages.ptest: 1.7.4 -> 2.0.3 --- pkgs/development/python-modules/ptest/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/ptest/default.nix b/pkgs/development/python-modules/ptest/default.nix index e7bc6618d867..d7de0c6ecb04 100644 --- a/pkgs/development/python-modules/ptest/default.nix +++ b/pkgs/development/python-modules/ptest/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "ptest"; - version = "1.7.4"; + version = "2.0.3"; format = "setuptools"; src = fetchFromGitHub { owner = "KarlGong"; - repo = pname; - rev = version + "-release"; - sha256 = "0v1zpfjagjlvdmgv6d502nmb7s996wadvpzg93i651s64rrlwq4s"; + repo = "ptest"; + tag = "${version}-release"; + hash = "sha256-lmiBqFWGfYdsBXCh6dQ9xed+HhpP6PWa9Csr68GtLxs="; }; passthru.updateScript = nix-update-script { From 090e1d3742297c9a92507251c8e05dbdbac4dec2 Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 10 Jan 2025 23:39:47 +0900 Subject: [PATCH 3/3] python312Packages.ptest: refactor --- pkgs/development/python-modules/ptest/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/ptest/default.nix b/pkgs/development/python-modules/ptest/default.nix index d7de0c6ecb04..def86273b9dc 100644 --- a/pkgs/development/python-modules/ptest/default.nix +++ b/pkgs/development/python-modules/ptest/default.nix @@ -2,13 +2,14 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, nix-update-script, }: buildPythonPackage rec { pname = "ptest"; version = "2.0.3"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "KarlGong"; @@ -17,6 +18,13 @@ buildPythonPackage rec { hash = "sha256-lmiBqFWGfYdsBXCh6dQ9xed+HhpP6PWa9Csr68GtLxs="; }; + build-system = [ setuptools ]; + + pythonImportsCheck = [ "ptest" ]; + + # I don't know how to run the tests + doCheck = false; + passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex" @@ -24,9 +32,10 @@ buildPythonPackage rec { ]; }; - meta = with lib; { + meta = { description = "Test classes and test cases using decorators, execute test cases by command line, and get clear reports"; homepage = "https://pypi.python.org/pypi/ptest"; - license = licenses.asl20; + license = lib.licenses.asl20; + mainProgram = "ptest"; }; }