From 303eaed49fc3859b7a987120ea528d0a47fdf5b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 27 Mar 2022 20:08:59 +0200 Subject: [PATCH 1/4] flit, flit-core: update homepage --- pkgs/development/python-modules/flit-core/default.nix | 2 +- pkgs/development/python-modules/flit/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flit-core/default.nix b/pkgs/development/python-modules/flit-core/default.nix index 35bba06f1f36..34d6b0b706fe 100644 --- a/pkgs/development/python-modules/flit-core/default.nix +++ b/pkgs/development/python-modules/flit-core/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Distribution-building parts of Flit. See flit package for more information"; - homepage = "https://github.com/takluyver/flit"; + homepage = "https://github.com/pypa/flit"; license = licenses.bsd3; maintainers = with maintainers; [ fridh SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/flit/default.nix b/pkgs/development/python-modules/flit/default.nix index 830ed2702b89..a0e1832a33ef 100644 --- a/pkgs/development/python-modules/flit/default.nix +++ b/pkgs/development/python-modules/flit/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "A simple packaging tool for simple packages"; - homepage = "https://github.com/takluyver/flit"; + homepage = "https://github.com/pypa/flit"; license = licenses.bsd3; maintainers = [ maintainers.fridh ]; }; From 3073f621c1194a044915059db8c96289715ea804 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 27 Mar 2022 20:09:47 +0200 Subject: [PATCH 2/4] python39Packages.flit: sync maintainers with flit-core --- pkgs/development/python-modules/flit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/flit/default.nix b/pkgs/development/python-modules/flit/default.nix index a0e1832a33ef..b1c57c2c35a6 100644 --- a/pkgs/development/python-modules/flit/default.nix +++ b/pkgs/development/python-modules/flit/default.nix @@ -52,6 +52,6 @@ buildPythonPackage rec { description = "A simple packaging tool for simple packages"; homepage = "https://github.com/pypa/flit"; license = licenses.bsd3; - maintainers = [ maintainers.fridh ]; + maintainers = with maintainers; [ fridh SuperSandro2000 ]; }; } From 0dc9824089477730157091e6eff4b593f0a81889 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 27 Mar 2022 20:10:09 +0200 Subject: [PATCH 3/4] python39Packages.flit: 3.6.0 -> 3.7.1 --- pkgs/development/python-modules/flit-core/default.nix | 2 +- pkgs/development/python-modules/flit/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/flit-core/default.nix b/pkgs/development/python-modules/flit-core/default.nix index 34d6b0b706fe..d0b83d30ea27 100644 --- a/pkgs/development/python-modules/flit-core/default.nix +++ b/pkgs/development/python-modules/flit-core/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "flit-core"; - version = "3.6.0"; + inherit (flit) version; format = "pyproject"; outputs = [ diff --git a/pkgs/development/python-modules/flit/default.nix b/pkgs/development/python-modules/flit/default.nix index b1c57c2c35a6..1fec4896234a 100644 --- a/pkgs/development/python-modules/flit/default.nix +++ b/pkgs/development/python-modules/flit/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "flit"; - version = "3.6.0"; + version = "3.7.1"; format = "pyproject"; src = fetchFromGitHub { owner = "takluyver"; repo = "flit"; rev = version; - sha256 = "sha256-D3q/1g6njrrmizooGmzNd9g2nKs00dMGj9jrrv3Y6HQ="; + sha256 = "sha256-zKgaeK3fskz2TuHvIWlxBrdZIWfIJHhaqopZ3+V36wY="; }; nativeBuildInputs = [ From e34303895eb37abae89ab583908ab47036d19859 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 27 Mar 2022 20:12:44 +0200 Subject: [PATCH 4/4] python39Packages.flit: switch to pytestCheckHook --- pkgs/development/python-modules/flit/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/flit/default.nix b/pkgs/development/python-modules/flit/default.nix index 1fec4896234a..598905d97ffa 100644 --- a/pkgs/development/python-modules/flit/default.nix +++ b/pkgs/development/python-modules/flit/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , docutils , requests -, pytest +, pytestCheckHook , testpath , responses , flit-core @@ -40,13 +40,12 @@ buildPythonPackage rec { tomli-w ]; - checkInputs = [ pytest testpath responses ]; + checkInputs = [ pytestCheckHook testpath responses ]; - # Disable test that needs some ini file. - # Disable test that wants hg - checkPhase = '' - HOME=$(mktemp -d) pytest -k "not test_invalid_classifier and not test_build_sdist" - ''; + disabledTests = [ + # needs some ini file. + "test_invalid_classifier" + ]; meta = with lib; { description = "A simple packaging tool for simple packages";