From 31b4ce9d67ad73ba82b3aafcf5c5790654da6377 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 13 Jan 2021 09:26:03 +0100 Subject: [PATCH 1/2] python3Packages.faker: 4.18.0 -> 5.5.1 --- pkgs/development/python-modules/faker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index abdb0f58394..6a7d7f6e146 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -16,11 +16,11 @@ assert pythonOlder "3.3" -> ipaddress != null; buildPythonPackage rec { pname = "Faker"; - version = "4.18.0"; + version = "5.5.1"; src = fetchPypi { inherit pname version; - sha256 = "0raxw6mgvf9523v7917zqw76vqnpp0d6v3i310qnjnhpxmm78yb2"; + sha256 = "1bskhmiir1ajipj7j535j2mxgnp6s3mxbvlag4aryj9zbhgg1c19"; }; nativeBuildInputs = [ pytestrunner ]; From 6e31a9a2d0e4a6e706114e0f3d3516e10e608e6d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 13 Jan 2021 12:32:42 +0100 Subject: [PATCH 2/2] python3Packages.faker: adjust requirements and check part --- .../python-modules/faker/default.nix | 44 +++++++------------ 1 file changed, 15 insertions(+), 29 deletions(-) diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index 6a7d7f6e146..990908efe03 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -1,19 +1,14 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder, -# Build inputs -dateutil, six, text-unidecode, ipaddress ? null -# Test inputs -, email_validator +{ lib +, buildPythonPackage +, fetchPypi +, dateutil +, text-unidecode , freezegun -, mock -, more-itertools , pytestCheckHook -, pytestrunner , ukpostcodeparser , validators }: -assert pythonOlder "3.3" -> ipaddress != null; - buildPythonPackage rec { pname = "Faker"; version = "5.5.1"; @@ -23,37 +18,28 @@ buildPythonPackage rec { sha256 = "1bskhmiir1ajipj7j535j2mxgnp6s3mxbvlag4aryj9zbhgg1c19"; }; - nativeBuildInputs = [ pytestrunner ]; + propagatedBuildInputs = [ + dateutil + text-unidecode + ]; + checkInputs = [ - email_validator freezegun pytestCheckHook ukpostcodeparser validators - ] - ++ lib.optionals (pythonOlder "3.3") [ mock ] - ++ lib.optionals (pythonOlder "3.0") [ more-itertools ]; + ]; # avoid tests which import random2, an abandoned library pytestFlagsArray = [ "--ignore=tests/providers/test_ssn.py" ]; - - propagatedBuildInputs = [ - dateutil - six - text-unidecode - ]; - - postPatch = '' - substituteInPlace setup.py --replace "pytest>=3.8.0,<3.9" "pytest" - ''; + pythonImportsCheck = [ "faker" ]; meta = with lib; { - description = "A Python library for generating fake user data"; - homepage = "http://faker.rtfd.org"; - license = licenses.mit; + description = "Python library for generating fake user data"; + homepage = "http://faker.rtfd.org"; + license = licenses.mit; maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; }; }