From 4d59df09de5136f5c6ffed8d6ef6b2ad78648cad Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Tue, 21 Mar 2023 16:39:26 +0100 Subject: [PATCH 1/2] woob: add tests.version --- pkgs/development/python-modules/woob/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/woob/default.nix b/pkgs/development/python-modules/woob/default.nix index ee71b7cae4f1..9130ebdd346b 100644 --- a/pkgs/development/python-modules/woob/default.nix +++ b/pkgs/development/python-modules/woob/default.nix @@ -23,7 +23,9 @@ , requests , simplejson , termcolor +, testers , unidecode +, woob }: buildPythonPackage rec { @@ -86,6 +88,11 @@ buildPythonPackage rec { "woob" ]; + passthru.tests.version = testers.testVersion { + package = woob; + version = "v${version}"; + }; + meta = with lib; { description = "Collection of applications and APIs to interact with websites"; homepage = "https://woob.tech"; From cd9d054201a3c91762f719648f1c81c3d4ed9589 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Tue, 21 Mar 2023 16:16:03 +0100 Subject: [PATCH 2/2] woob: 3.0->3.3.1 --- .../python-modules/woob/default.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/woob/default.nix b/pkgs/development/python-modules/woob/default.nix index 9130ebdd346b..53a1b877c05d 100644 --- a/pkgs/development/python-modules/woob/default.nix +++ b/pkgs/development/python-modules/woob/default.nix @@ -5,6 +5,7 @@ , cssselect , feedparser , fetchFromGitLab +, fetchpatch , gdata , gnupg , google-api-python-client @@ -13,6 +14,7 @@ , lxml , mechanize , nose +, packaging , pdfminer-six , pillow , prettytable @@ -30,7 +32,7 @@ buildPythonPackage rec { pname = "woob"; - version = "3.0"; + version = "3.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -39,10 +41,11 @@ buildPythonPackage rec { owner = "woob"; repo = pname; rev = version; - hash = "sha256-XLcHNidclORbxVXgcsHY6Ja/dak+EVSKTaVQmg1f/rw="; + hash = "sha256-aPkMfPRDjPfHIlGDEvorGwk09yQuEWwOkJJUST0vLAs="; }; nativeBuildInputs = [ + packaging pyqt5 ]; @@ -59,6 +62,7 @@ buildPythonPackage rec { libyaml lxml mechanize + packaging pdfminer-six pillow prettytable @@ -70,11 +74,12 @@ buildPythonPackage rec { unidecode ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "with-doctest = 1" "" \ - --replace "with-coverage = 1" "" - ''; + patches = [ + (fetchpatch { + url = "https://gitlab.com/woob/woob/-/commit/861b1bb92be53998d8174dcca6fa643d1c7cde12.patch"; + sha256 = "sha256-IXcE59pMFtPLTOYa2inIvuA14USQvck6Q4hrKZTC0DE="; + }) + ]; nativeCheckInputs = [ nose