From edaf27c25b439e79bd0927dc0fd8f2b784181df5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 27 Mar 2024 02:11:14 +0000 Subject: [PATCH 1/3] python312Packages.markdownify: 0.11.6 -> 0.12.1 --- pkgs/development/python-modules/markdownify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/markdownify/default.nix b/pkgs/development/python-modules/markdownify/default.nix index 19f842938007..03fff0de01bb 100644 --- a/pkgs/development/python-modules/markdownify/default.nix +++ b/pkgs/development/python-modules/markdownify/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "markdownify"; - version = "0.11.6"; + version = "0.12.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-AJskDgyfTI6vHQhWJdzUAR4S8PjOxV3t+epvdlXkm/4="; + hash = "sha256-H7CMYYsw4O56MaObmY9EoY+yirJU9V9K8GttNaIXnic="; }; propagatedBuildInputs = [ beautifulsoup4 six ]; From a00bc0510d7059ae820580eb6e0ead6196f84b18 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 27 Mar 2024 08:53:59 +0100 Subject: [PATCH 2/3] python312Packages.markdownify: add changelog to meta --- pkgs/development/python-modules/markdownify/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/markdownify/default.nix b/pkgs/development/python-modules/markdownify/default.nix index 03fff0de01bb..886d078a690e 100644 --- a/pkgs/development/python-modules/markdownify/default.nix +++ b/pkgs/development/python-modules/markdownify/default.nix @@ -21,9 +21,10 @@ buildPythonPackage rec { meta = with lib; { description = "HTML to Markdown converter"; - mainProgram = "markdownify"; homepage = "https://github.com/matthewwithanm/python-markdownify"; + changelog = "https://github.com/matthewwithanm/python-markdownify/releases/tag/${version}"; license = licenses.mit; - maintainers = [ maintainers.McSinyx ]; + maintainers = with maintainers; [ McSinyx ]; + mainProgram = "markdownify"; }; } From 32dbb625878907a4f1a7f40fc1107520ef8b1b0c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 27 Mar 2024 08:56:42 +0100 Subject: [PATCH 3/3] python312Packages.markdownify: refactor --- .../python-modules/markdownify/default.nix | 26 ++++++++++++++++--- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/markdownify/default.nix b/pkgs/development/python-modules/markdownify/default.nix index 886d078a690e..e6b09592073a 100644 --- a/pkgs/development/python-modules/markdownify/default.nix +++ b/pkgs/development/python-modules/markdownify/default.nix @@ -1,23 +1,41 @@ { lib +, beautifulsoup4 , buildPythonPackage , fetchPypi , pytestCheckHook -, beautifulsoup4 +, pythonOlder +, setuptools , six }: buildPythonPackage rec { pname = "markdownify"; version = "0.12.1"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; hash = "sha256-H7CMYYsw4O56MaObmY9EoY+yirJU9V9K8GttNaIXnic="; }; - propagatedBuildInputs = [ beautifulsoup4 six ]; - nativeCheckInputs = [ pytestCheckHook ]; + build-system = [ + setuptools + ]; + + dependencies = [ + beautifulsoup4 + six + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "markdownify" + ]; meta = with lib; { description = "HTML to Markdown converter";