From ba53e70800050586be06c2e1ff37074de2a6e108 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 11 May 2024 22:10:19 +0200
Subject: python311Packages.html-text: 0.5.2 -> 0.6.2

Diff: https://github.com/zytedata/html-text/compare/refs/tags/0.5.2...0.6.2

Changelog: https://github.com/zytedata/html-text/blob/0.6.2/CHANGES.rst
---
 pkgs/development/python-modules/html-text/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'pkgs/development/python-modules/html-text')

diff --git a/pkgs/development/python-modules/html-text/default.nix b/pkgs/development/python-modules/html-text/default.nix
index 00d2fb426d381..9afbd61a8a22a 100644
--- a/pkgs/development/python-modules/html-text/default.nix
+++ b/pkgs/development/python-modules/html-text/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "html-text";
-  version = "0.5.2";
+  version = "0.6.2";
   format = "setuptools";
 
   src = fetchFromGitHub {
-    owner = "TeamHG-Memex";
+    owner = "zytedata";
     repo = "html-text";
-    rev = version;
-    hash = "sha256-jw/hpz0QfcgP5OEJcmre0h1OzOfpPtaROxHm+YUqces=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-e9gkibQv8mn1Jbt77UmpauOeTqhJQhY9R5Sge/iYi+U=";
   };
 
   propagatedBuildInputs = [
@@ -31,7 +31,8 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Extract text from HTML";
-    homepage = "https://github.com/TeamHG-Memex/html-text";
+    homepage = "https://github.com/zytedata/html-text";
+    changelog = "https://github.com/zytedata/html-text/blob/${version}/CHANGES.rst";
     license = licenses.mit;
     maintainers = with maintainers; [ ambroisie ];
   };
-- 
cgit 1.4.1


From 9fd8a8ba4dd390defb15f8ee545bb67d6b549eb6 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 11 May 2024 22:12:17 +0200
Subject: python312Packages.html-text: refactor

---
 pkgs/development/python-modules/html-text/default.nix | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'pkgs/development/python-modules/html-text')

diff --git a/pkgs/development/python-modules/html-text/default.nix b/pkgs/development/python-modules/html-text/default.nix
index 9afbd61a8a22a..c1733f164f4ff 100644
--- a/pkgs/development/python-modules/html-text/default.nix
+++ b/pkgs/development/python-modules/html-text/default.nix
@@ -2,14 +2,18 @@
 , buildPythonPackage
 , fetchFromGitHub
 , lxml
-, six
+, lxml-html-clean
 , pytestCheckHook
+, pythonOlder
+, setuptools
 }:
 
 buildPythonPackage rec {
   pname = "html-text";
   version = "0.6.2";
-  format = "setuptools";
+  pyproject = true;
+
+  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "zytedata";
@@ -18,13 +22,17 @@ buildPythonPackage rec {
     hash = "sha256-e9gkibQv8mn1Jbt77UmpauOeTqhJQhY9R5Sge/iYi+U=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
     lxml
+    lxml-html-clean
   ];
 
   nativeCheckInputs = [
     pytestCheckHook
-    six
   ];
 
   pythonImportsCheck = [ "html_text" ];
-- 
cgit 1.4.1


From 01701d1a13f87e396be13735209ed4d772c6e362 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 11 May 2024 22:12:38 +0200
Subject: python312Packages.html-text: format with nixfmt

---
 .../python-modules/html-text/default.nix           | 25 ++++++++++------------
 1 file changed, 11 insertions(+), 14 deletions(-)

(limited to 'pkgs/development/python-modules/html-text')

diff --git a/pkgs/development/python-modules/html-text/default.nix b/pkgs/development/python-modules/html-text/default.nix
index c1733f164f4ff..43d7ca228bb0e 100644
--- a/pkgs/development/python-modules/html-text/default.nix
+++ b/pkgs/development/python-modules/html-text/default.nix
@@ -1,11 +1,12 @@
-{ lib
-, buildPythonPackage
-, fetchFromGitHub
-, lxml
-, lxml-html-clean
-, pytestCheckHook
-, pythonOlder
-, setuptools
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  lxml,
+  lxml-html-clean,
+  pytestCheckHook,
+  pythonOlder,
+  setuptools,
 }:
 
 buildPythonPackage rec {
@@ -22,18 +23,14 @@ buildPythonPackage rec {
     hash = "sha256-e9gkibQv8mn1Jbt77UmpauOeTqhJQhY9R5Sge/iYi+U=";
   };
 
-  build-system = [
-    setuptools
-  ];
+  build-system = [ setuptools ];
 
   dependencies = [
     lxml
     lxml-html-clean
   ];
 
-  nativeCheckInputs = [
-    pytestCheckHook
-  ];
+  nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "html_text" ];
 
-- 
cgit 1.4.1