From 731c15f2559a5e9879863937d2db068436eb25ba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Oct 2024 03:07:59 +0000 Subject: [PATCH 1/3] python312Packages.mail-parser: 3.15.0 -> 4.0.0 --- pkgs/development/python-modules/mail-parser/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/mail-parser/default.nix b/pkgs/development/python-modules/mail-parser/default.nix index 5a3084ae84cf..fbac89a71b2e 100644 --- a/pkgs/development/python-modules/mail-parser/default.nix +++ b/pkgs/development/python-modules/mail-parser/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "mail-parser"; - version = "3.15.0"; + version = "4.0.0"; format = "setuptools"; src = fetchFromGitHub { owner = "SpamScope"; repo = pname; - rev = "v${version}"; - sha256 = "0da2qr4p8jnjw6jdhbagm6slfcjnjyyjkszwfcfqvcywh1zm1sdw"; + rev = "refs/tags/${version}"; + sha256 = "sha256-WpV1WJFwzAquPXimew86YpEp++dnkIiBe5E4lMBDl7w="; }; LC_ALL = "en_US.utf-8"; From d91a2832bd9ed559974c25ce9d839c37531b207a Mon Sep 17 00:00:00 2001 From: natsukium Date: Tue, 29 Oct 2024 17:31:35 +0900 Subject: [PATCH 2/3] python312Packages.mail-parser: switch to pypa builder --- .../python-modules/mail-parser/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/mail-parser/default.nix b/pkgs/development/python-modules/mail-parser/default.nix index fbac89a71b2e..85b975b0c9c2 100644 --- a/pkgs/development/python-modules/mail-parser/default.nix +++ b/pkgs/development/python-modules/mail-parser/default.nix @@ -4,27 +4,31 @@ python, glibcLocales, fetchFromGitHub, + setuptools, six, - simplejson, }: buildPythonPackage rec { pname = "mail-parser"; version = "4.0.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "SpamScope"; - repo = pname; + repo = "mail-parser"; rev = "refs/tags/${version}"; - sha256 = "sha256-WpV1WJFwzAquPXimew86YpEp++dnkIiBe5E4lMBDl7w="; + hash = "sha256-WpV1WJFwzAquPXimew86YpEp++dnkIiBe5E4lMBDl7w="; }; LC_ALL = "en_US.utf-8"; nativeBuildInputs = [ glibcLocales ]; - propagatedBuildInputs = [ - simplejson + + build-system = [ setuptools ]; + + pythonRemoveDeps = [ "ipaddress" ]; + + dependencies = [ six ]; From 298d3d05f27c39072c04988e6d64aeb236b59a14 Mon Sep 17 00:00:00 2001 From: natsukium Date: Tue, 29 Oct 2024 17:32:47 +0900 Subject: [PATCH 3/3] python312Packages.mail-parser: refactor test --- .../python-modules/mail-parser/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mail-parser/default.nix b/pkgs/development/python-modules/mail-parser/default.nix index 85b975b0c9c2..226fe1878de2 100644 --- a/pkgs/development/python-modules/mail-parser/default.nix +++ b/pkgs/development/python-modules/mail-parser/default.nix @@ -4,6 +4,8 @@ python, glibcLocales, fetchFromGitHub, + pytest-cov-stub, + pytestCheckHook, setuptools, six, }: @@ -32,9 +34,15 @@ buildPythonPackage rec { six ]; + pythonImportsCheck = [ "mailparser" ]; + + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; + # Taken from .travis.yml - checkPhase = '' - ${python.interpreter} tests/test_main.py + postCheck = '' ${python.interpreter} -m mailparser -v ${python.interpreter} -m mailparser -h ${python.interpreter} -m mailparser -f tests/mails/mail_malformed_3 -j