diff --git a/pkgs/development/python-modules/woob/default.nix b/pkgs/development/python-modules/woob/default.nix index cf03a672a078..db4a5da315a5 100644 --- a/pkgs/development/python-modules/woob/default.nix +++ b/pkgs/development/python-modules/woob/default.nix @@ -1,9 +1,8 @@ { lib, - babel, buildPythonPackage, fetchFromGitLab, - fetchpatch, + babel, html2text, lxml, packaging, @@ -20,41 +19,33 @@ setuptools, testers, unidecode, + termcolor, + responses, woob, }: buildPythonPackage rec { pname = "woob"; - version = "3.6"; + version = "3.7"; pyproject = true; - disabled = pythonOlder "3.7"; src = fetchFromGitLab { owner = "woob"; repo = "woob"; - rev = version; - hash = "sha256-M9AjV954H1w64YGCVxDEGGSnoEbmocG3zwltob6IW04="; + tag = version; + hash = "sha256-EZHzw+/BIIvmDXG4fF367wsdUTVTHWYb0d0U56ZXwOs="; }; - patches = [ - (fetchpatch { - name = "no-deprecated-pkg_resources.patch"; - url = "https://gitlab.com/woob/woob/-/commit/3283c4c1a935cc71acea98b2d8c88bc4bf28f643.patch"; - hash = "sha256-3bRuv93ivKRxbGr52coO023DlxHZWwUeInXTPqQAeL8="; - }) - ]; - - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; pythonRelaxDeps = [ "packaging" "rich" + "requests" ]; - propagatedBuildInputs = [ + dependencies = [ babel python-dateutil python-jose @@ -68,9 +59,13 @@ buildPythonPackage rec { requests rich unidecode + termcolor ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + responses + ]; disabledTests = [ # require networking @@ -85,12 +80,12 @@ buildPythonPackage rec { version = "v${version}"; }; - meta = with lib; { + meta = { changelog = "https://gitlab.com/woob/woob/-/blob/${src.rev}/ChangeLog"; description = "Collection of applications and APIs to interact with websites"; mainProgram = "woob"; homepage = "https://woob.tech"; - license = licenses.lgpl3Plus; - maintainers = with maintainers; [ DamienCassou ]; + license = lib.licenses.lgpl3Plus; + maintainers = with lib.maintainers; [ DamienCassou ]; }; }