From e112247f93dae1f5d69d41d413a407b089416cb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 24 May 2022 03:31:33 +0000 Subject: [PATCH 1/4] gnome-feeds: use readability-lxml --- .../applications/networking/feedreaders/gnome-feeds/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/feedreaders/gnome-feeds/default.nix b/pkgs/applications/networking/feedreaders/gnome-feeds/default.nix index 633c1e744bb6..f80be45ebd1f 100644 --- a/pkgs/applications/networking/feedreaders/gnome-feeds/default.nix +++ b/pkgs/applications/networking/feedreaders/gnome-feeds/default.nix @@ -61,7 +61,7 @@ python3.pkgs.buildPythonApplication rec { pillow pygments pygobject3 - pyreadability + readability-lxml pytz requests ]; From 4dcada7989b3cc47f4f6c8c688854d093a24bd43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 24 May 2022 03:32:21 +0000 Subject: [PATCH 2/4] qutebrowser: use readability-lxml --- pkgs/applications/networking/browsers/qutebrowser/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 2e96266fd737..91ef3270dc45 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -61,7 +61,7 @@ in mkDerivationWith python3Packages.buildPythonApplication rec { pyyaml backendPackage jinja2 pygments # scripts and userscripts libs tldextract beautifulsoup4 - pyreadability pykeepass stem + readability-lxml pykeepass stem pynacl # extensive ad blocking adblock From 26e554d7a4258e78ecf053a5ba4678ab3224f158 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 24 May 2022 03:14:51 +0000 Subject: [PATCH 3/4] python3Packages.pyreadability: make alias of readability-lxml The former is an unmaintained fork of the latter. --- .../python-modules/pyreadability/default.nix | 25 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 pkgs/development/python-modules/pyreadability/default.nix diff --git a/pkgs/development/python-modules/pyreadability/default.nix b/pkgs/development/python-modules/pyreadability/default.nix deleted file mode 100644 index 9aa87d238ec9..000000000000 --- a/pkgs/development/python-modules/pyreadability/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, fetchPypi, buildPythonPackage -, requests, chardet, cssselect, lxml -}: - -buildPythonPackage rec { - pname = "PyReadability"; - version = "0.4.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "1k6fq416pdmjcdqh6gdxl0y0k8kj1zlpzwp5574xsvsha18p2zpn"; - }; - - propagatedBuildInputs = [ requests chardet cssselect lxml ]; - - # ModuleNotFoundError: No module named 'tests' - doCheck = false; - - meta = { - homepage = "https://github.com/hyperlinkapp/python-readability"; - description = "fast python port of arc90's readability tool, updated to match latest readability.js!"; - license = lib.licenses.asl20; - }; - -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 5e421b9c3369..5684867cad0b 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -105,6 +105,7 @@ mapAliases ({ pycallgraph = throw "pycallgraph has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18 pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20 pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04 + pyreadability = readability-lxml; # added 2022-05-24 pysmart-smartx = pysmart; # added 2021-10-22 pytest_6 = pytest; # added 2022-02-10 pytestcov = pytest-cov; # added 2021-01-04 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 34a318a6e077..e265c10a01c5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7800,8 +7800,6 @@ in { pyramid_multiauth = callPackage ../development/python-modules/pyramid_multiauth { }; - pyreadability = callPackage ../development/python-modules/pyreadability { }; - pyrealsense2 = toPythonModule (pkgs.librealsense.override { enablePython = true; pythonPackages = self; From 2c5a0e07a97193816f4306261bf2ed3908eaf9ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 24 May 2022 03:42:45 +0000 Subject: [PATCH 4/4] python3Packages.readability-lxml: run tests --- .../python-modules/readability-lxml/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/readability-lxml/default.nix b/pkgs/development/python-modules/readability-lxml/default.nix index e012bf75fe58..8313b63d37e1 100644 --- a/pkgs/development/python-modules/readability-lxml/default.nix +++ b/pkgs/development/python-modules/readability-lxml/default.nix @@ -1,19 +1,22 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pytestCheckHook , chardet , cssselect , lxml +, timeout-decorator }: buildPythonPackage rec { pname = "readability-lxml"; version = "0.8.1"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-5R/qVrWQmq+IbTB9SOeeCWKTJVr6Vnt9CLypTSWxpOE="; + src = fetchFromGitHub { + owner = "buriy"; + repo = "python-readability"; + rev = "v${version}"; + hash = "sha256-MKdQRety24qOG9xgIdaCJ72XEImP42SlMG6tC7bwzo4="; }; propagatedBuildInputs = [ chardet cssselect lxml ]; @@ -22,7 +25,10 @@ buildPythonPackage rec { substituteInPlace setup.py --replace 'sys.platform == "darwin"' "False" ''; - doCheck = false; + checkInputs = [ + pytestCheckHook + timeout-decorator + ]; meta = with lib; { description = "Fast python port of arc90's readability tool";