From 2c8f296b3795c91e6bb983fbcfb492e550d0bcf3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 Dec 2022 15:40:01 +0100 Subject: [PATCH 1/3] python310Packages.versioneer: add changelog to meta --- pkgs/development/python-modules/versioneer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/versioneer/default.nix b/pkgs/development/python-modules/versioneer/default.nix index 131bf9d7f425..51af7a498346 100644 --- a/pkgs/development/python-modules/versioneer/default.nix +++ b/pkgs/development/python-modules/versioneer/default.nix @@ -16,8 +16,7 @@ buildPythonPackage rec { hash = "sha256-hPxymqKW0dJmRaj2LxeAGYhf9vmhBzsppKIoJwrFJXs="; }; - # Couldn't get tests to work because, for instance, they used virtualenv and - # pip. + # Couldn't get tests to work because, for instance, they used virtualenv and pip doCheck = false; pythonImportsCheck = [ @@ -27,6 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Version-string management for VCS-controlled trees"; homepage = "https://github.com/warner/python-versioneer"; + changelog = "https://github.com/python-versioneer/python-versioneer/blob/${version}/NEWS.md"; license = licenses.publicDomain; maintainers = with maintainers; [ jluttine ]; }; From 04ebf457aecb4711666de3fdb53d46c7659de325 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 Dec 2022 15:45:21 +0100 Subject: [PATCH 2/3] python310Packages.versioneer: 0.26 -> 0.27 Changelog: https://github.com/python-versioneer/python-versioneer/blob/0.27/NEWS.md --- .../python-modules/versioneer/default.nix | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/versioneer/default.nix b/pkgs/development/python-modules/versioneer/default.nix index 51af7a498346..454ea83962b8 100644 --- a/pkgs/development/python-modules/versioneer/default.nix +++ b/pkgs/development/python-modules/versioneer/default.nix @@ -1,21 +1,31 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pythonOlder +, setuptools +, tomli }: buildPythonPackage rec { pname = "versioneer"; - version = "0.26"; - format = "setuptools"; + version = "0.27"; + format = "pyproject"; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-hPxymqKW0dJmRaj2LxeAGYhf9vmhBzsppKIoJwrFJXs="; + src = fetchFromGitHub { + owner = "python-versioneer"; + repo = "python-versioneer"; + rev = "refs/tags/${version}"; + hash = "sha256-yCO9dqqEUdvLDLAfHkYUA+dHwn2OLrFlubWeGbvlAbA="; }; + nativeBuildInputs = [ + setuptools + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli + ]; + # Couldn't get tests to work because, for instance, they used virtualenv and pip doCheck = false; From 08a508da5d1b07daa7dca2ac0794715c6dccae59 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 Dec 2022 15:45:37 +0100 Subject: [PATCH 3/3] python310Packages.versioneer: 0.27 -> 0.28 Diff: https://github.com/python-versioneer/python-versioneer/compare/refs/tags/0.27...0.28 Changelog: https://github.com/python-versioneer/python-versioneer/blob/0.28/NEWS.md --- pkgs/development/python-modules/versioneer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/versioneer/default.nix b/pkgs/development/python-modules/versioneer/default.nix index 454ea83962b8..5976a307bf0a 100644 --- a/pkgs/development/python-modules/versioneer/default.nix +++ b/pkgs/development/python-modules/versioneer/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "versioneer"; - version = "0.27"; + version = "0.28"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "python-versioneer"; repo = "python-versioneer"; rev = "refs/tags/${version}"; - hash = "sha256-yCO9dqqEUdvLDLAfHkYUA+dHwn2OLrFlubWeGbvlAbA="; + hash = "sha256-Jy0c1I3kLgJAeGWzcgl5qVAWesf4EXaMIOW03B+1yWE="; }; nativeBuildInputs = [