From bb26db7dd930499c3a759623ee05473953094cfd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 25 Feb 2023 18:17:22 +0100 Subject: [PATCH 1/5] python310Packages.nestedtext: add changelog to meta --- pkgs/development/python-modules/nestedtext/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/nestedtext/default.nix b/pkgs/development/python-modules/nestedtext/default.nix index c8b0c77b7a39..4751e17e0b6c 100644 --- a/pkgs/development/python-modules/nestedtext/default.nix +++ b/pkgs/development/python-modules/nestedtext/default.nix @@ -37,6 +37,7 @@ buildPythonPackage rec { non-programmers. ''; homepage = "https://nestedtext.org"; + changelog = "https://github.com/KenKundert/nestedtext/blob/v${version}/doc/releases.rst"; license = licenses.mit; maintainers = with maintainers; [ jeremyschlatter ]; }; From 49a676052101f4b2206a2b559181ab6050c0eac4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 25 Feb 2023 18:21:03 +0100 Subject: [PATCH 2/5] python310Packages.nestedtext: equalize --- .../python-modules/nestedtext/default.nix | 27 ++++++++++++++----- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/nestedtext/default.nix b/pkgs/development/python-modules/nestedtext/default.nix index 4751e17e0b6c..572091daa874 100644 --- a/pkgs/development/python-modules/nestedtext/default.nix +++ b/pkgs/development/python-modules/nestedtext/default.nix @@ -1,8 +1,10 @@ -{ lib, buildPythonPackage, fetchFromGitHub -, inform -, pytestCheckHook +{ lib +, buildPythonPackage , docopt +, fetchFromGitHub +, inform , natsort +, pytestCheckHook , voluptuous }: @@ -13,15 +15,26 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "KenKundert"; repo = "nestedtext"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; fetchSubmodules = true; sha256 = "1dwks5apghg29aj90nc4qm0chk195jh881297zr1wk7mqd2n159y"; }; - propagatedBuildInputs = [ inform ]; + propagatedBuildInputs = [ + inform + ]; - nativeCheckInputs = [ pytestCheckHook docopt natsort voluptuous ]; - pytestFlagsArray = [ "--ignore=build" ]; # Avoids an ImportMismatchError. + nativeCheckInputs = [ + docopt + natsort + pytestCheckHook + voluptuous + ]; + + pytestFlagsArray = [ + # Avoids an ImportMismatchError. + "--ignore=build" + ]; meta = with lib; { description = "A human friendly data format"; From dba4f3816648b2a1a53df0b7b4ad23619d97e7f7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 25 Feb 2023 18:22:36 +0100 Subject: [PATCH 3/5] python310Packages.nestedtext: disable on unsupported Python releases --- pkgs/development/python-modules/nestedtext/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/nestedtext/default.nix b/pkgs/development/python-modules/nestedtext/default.nix index 572091daa874..4f1705343b24 100644 --- a/pkgs/development/python-modules/nestedtext/default.nix +++ b/pkgs/development/python-modules/nestedtext/default.nix @@ -5,12 +5,16 @@ , inform , natsort , pytestCheckHook +, pythonOlder , voluptuous }: buildPythonPackage rec { pname = "nestedtext"; version = "1.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "KenKundert"; From 6509273d853b8d0b3d90fe5edfd43397525b1753 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 25 Feb 2023 19:56:33 +0100 Subject: [PATCH 4/5] python310Packages.nestedtext: 1.2 -> 3.5 Changelog: https://github.com/KenKundert/nestedtext/blob/v3.5/doc/releases.rst --- .../python-modules/nestedtext/default.nix | 38 +++++++++++++++---- 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/nestedtext/default.nix b/pkgs/development/python-modules/nestedtext/default.nix index 4f1705343b24..5b5aa8bfc5b7 100644 --- a/pkgs/development/python-modules/nestedtext/default.nix +++ b/pkgs/development/python-modules/nestedtext/default.nix @@ -2,17 +2,20 @@ , buildPythonPackage , docopt , fetchFromGitHub +, flitBuildHook +, hypothesis , inform -, natsort +, nestedtext , pytestCheckHook , pythonOlder +, quantiphy , voluptuous }: buildPythonPackage rec { pname = "nestedtext"; - version = "1.2"; - format = "setuptools"; + version = "3.5"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,26 +23,47 @@ buildPythonPackage rec { owner = "KenKundert"; repo = "nestedtext"; rev = "refs/tags/v${version}"; - fetchSubmodules = true; - sha256 = "1dwks5apghg29aj90nc4qm0chk195jh881297zr1wk7mqd2n159y"; + hash = "sha256-RGCcrGsDkBhThuUZd2LuuyXG9r1S7iOA75HYRxkwUrU="; }; - propagatedBuildInputs = [ + nativeBuildInputs = [ + flitBuildHook + ]; + + propagatedBuildInputs = [ inform ]; nativeCheckInputs = [ docopt - natsort + hypothesis + quantiphy pytestCheckHook voluptuous ]; + # Tests depend on quantiphy. To avoid infinite recursion, tests are only + # enabled when building passthru.tests. + doCheck = false; + pytestFlagsArray = [ # Avoids an ImportMismatchError. "--ignore=build" ]; + disabledTestPaths = [ + # Examples are prefixed with test_ + "examples/" + ]; + + passthru.tests = { + runTests = nestedtext.overrideAttrs (_: { doCheck = true; }); + }; + + pythonImportsCheck = [ + "nestedtext" + ]; + meta = with lib; { description = "A human friendly data format"; longDescription = '' From d6630686893dc78f4d2ab908d845cae131443224 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Mar 2023 09:29:26 +0100 Subject: [PATCH 5/5] python310Packages.parametrize-from-file: disable failing test --- .../python-modules/parametrize-from-file/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/parametrize-from-file/default.nix b/pkgs/development/python-modules/parametrize-from-file/default.nix index c020992bee22..38370a1c805a 100644 --- a/pkgs/development/python-modules/parametrize-from-file/default.nix +++ b/pkgs/development/python-modules/parametrize-from-file/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "parametrize_from_file"; - sha256 = "1c91j869n2vplvhawxc1sv8km8l53bhlxhhms43fyjsqvy351v5j"; + hash = "sha256-suxQht9YS+8G0RXCTuEahaI60daBda7gpncLmwySIbE="; }; patches = [ @@ -54,7 +54,14 @@ buildPythonPackage rec { toml ]; - pythonImportsCheck = [ "parametrize_from_file" ]; + pythonImportsCheck = [ + "parametrize_from_file" + ]; + + disabledTests = [ + # https://github.com/kalekundert/parametrize_from_file/issues/19 + "test_load_suite_params_err" + ]; meta = with lib; { description = "Read unit test parameters from config files";