Merge pull request #174225 from dotlambda/pyreadability-drop

python3Packages.pyreadability: make alias of readability-lxml

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

pkgs/applications/networking/feedreaders/gnome-feeds/default.nix

@@ -61,7 +61,7 @@ python3.pkgs.buildPythonApplication rec {
     pillow
     pygments
     pygobject3
-    pyreadability
+    readability-lxml
     pytz
     requests
   ];

pkgs/development/python-modules/pyreadability/default.nix

@@ -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;
-  };
-
-}

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";

pkgs/top-level/python-aliases.nix

@@ -108,6 +108,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

pkgs/top-level/python-packages.nix

@@ -7802,8 +7802,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;