From e9583cc89d33d8f7e36035f9ac2a6f4704d0590e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 15 Apr 2023 04:20:00 +0000 Subject: [PATCH 1/2] python310Packages.html5-parser: 0.4.10 -> 0.4.11 --- .../python-modules/html5-parser/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/html5-parser/default.nix b/pkgs/development/python-modules/html5-parser/default.nix index 3909c352185..2a8078f1f5a 100644 --- a/pkgs/development/python-modules/html5-parser/default.nix +++ b/pkgs/development/python-modules/html5-parser/default.nix @@ -1,18 +1,24 @@ -{ lib, buildPythonPackage, fetchPypi, pkgs, pkg-config, chardet, lxml }: +{ lib, buildPythonPackage, fetchPypi, pkgs, pkg-config, chardet, lxml, beautifulsoup4 }: buildPythonPackage rec { pname = "html5-parser"; - version = "0.4.10"; + version = "0.4.11"; + + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "f9294418c0da95c2d5facc19d3dc32941093a6b8e3b3e4b36cc7b5a1697fbca4"; + sha256 = "sha256-hbsW+qPN88bGhC4Mss4CgHy678bjuw87jhjavlEHB2M="; }; nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ chardet lxml pkgs.libxml2 ]; - doCheck = false; # No such file or directory: 'run_tests.py' + nativeCheckInputs = [ beautifulsoup4 ]; + + pythonImportsCheck = [ + "html5_parser" + ]; meta = with lib; { description = "Fast C based HTML 5 parsing for python"; From d479ac2b8ed41afb5c2f0e1fbd1d2764a250de25 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 16 Apr 2023 07:58:14 +0200 Subject: [PATCH 2/2] python310Packages.html5-parser: run tests --- .../python-modules/html5-parser/default.nix | 47 +++++++++++++++---- 1 file changed, 39 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/html5-parser/default.nix b/pkgs/development/python-modules/html5-parser/default.nix index 2a8078f1f5a..561c9c97f49 100644 --- a/pkgs/development/python-modules/html5-parser/default.nix +++ b/pkgs/development/python-modules/html5-parser/default.nix @@ -1,28 +1,59 @@ -{ lib, buildPythonPackage, fetchPypi, pkgs, pkg-config, chardet, lxml, beautifulsoup4 }: +{ lib +, beautifulsoup4 +, buildPythonPackage +, chardet +, fetchFromGitHub +, lxml +, pkg-config +, pkgs +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "html5-parser"; version = "0.4.11"; - format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-hbsW+qPN88bGhC4Mss4CgHy678bjuw87jhjavlEHB2M="; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "kovidgoyal"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-l7cCt+zX+qOujS6noc1/p7mELqrHae3eiKQNXBxLm7o="; }; - nativeBuildInputs = [ pkg-config ]; - propagatedBuildInputs = [ chardet lxml pkgs.libxml2 ]; + nativeBuildInputs = [ + pkg-config + ]; - nativeCheckInputs = [ beautifulsoup4 ]; + buildInputs = [ + pkgs.libxml2 + ]; + + propagatedBuildInputs = [ + chardet + lxml + ]; + + nativeCheckInputs = [ + beautifulsoup4 + pytestCheckHook + ]; pythonImportsCheck = [ "html5_parser" ]; + pytestFlagsArray = [ + "test/*.py" + ]; + meta = with lib; { description = "Fast C based HTML 5 parsing for python"; homepage = "https://html5-parser.readthedocs.io"; license = licenses.asl20; + maintainers = with maintainers; [ ]; }; }