From 09fb914be38fc7dcd88b15d891f480c124219823 Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 16 Oct 2023 18:00:58 +0900 Subject: [PATCH 1/2] python311Packages.docx2python: unstable-2020-11-15 -> 2.11.0 Diff: https://github.com/ShayHill/docx2python/compare/21b2edafc0a01a6cfb73aefc61747a65917e2cad...2.11.0 Changelog: https://github.com/ShayHill/docx2python/blob/2.11.0/CHANGELOG.md --- .../python-modules/docx2python/default.nix | 34 +++++++++++++------ 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/docx2python/default.nix b/pkgs/development/python-modules/docx2python/default.nix index 13b41949ebef..b4dfde34c332 100644 --- a/pkgs/development/python-modules/docx2python/default.nix +++ b/pkgs/development/python-modules/docx2python/default.nix @@ -1,24 +1,36 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, poetry-core +, lxml +, pytestCheckHook +}: buildPythonPackage rec { pname = "docx2python"; - version = "unstable-2020-11-15"; + version = "2.11.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; - # Pypi does not contain tests src = fetchFromGitHub { owner = "ShayHill"; repo = pname; - rev = "21b2edafc0a01a6cfb73aefc61747a65917e2cad"; - sha256 = "1nwg17ziwm9a2x7yxsscj8zgc1d383ifsk5w7qa2fws6gf627kyi"; + rev = "refs/tags/${version}"; + hash = "sha256-SavRYnNbESRQh9Elk8qCt/qdI2x+sYZJFMYy+Gojg2k="; }; - preCheck = "cd test"; # Tests require the `test/resources` folder to be accessible - nativeCheckInputs = [ pytestCheckHook ]; - disabledTests = [ # asserts related to file deletions fail - "test_docx2python.py" - "test_docx_context.py" - "test_google_docs.py" + nativeBuildInputs = [ + poetry-core ]; + + propagatedBuildInputs = [ + lxml + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "docx2python" ]; meta = with lib; { From 19d40d80ea67c337ab1b9de76c765ad93b595608 Mon Sep 17 00:00:00 2001 From: natsukium Date: Tue, 17 Oct 2023 13:49:39 +0900 Subject: [PATCH 2/2] python311Packages.docx2python: add changelog to meta --- pkgs/development/python-modules/docx2python/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/docx2python/default.nix b/pkgs/development/python-modules/docx2python/default.nix index b4dfde34c332..f65f4f7c9075 100644 --- a/pkgs/development/python-modules/docx2python/default.nix +++ b/pkgs/development/python-modules/docx2python/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ShayHill"; - repo = pname; + repo = "docx2python"; rev = "refs/tags/${version}"; hash = "sha256-SavRYnNbESRQh9Elk8qCt/qdI2x+sYZJFMYy+Gojg2k="; }; @@ -36,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/ShayHill/docx2python"; description = "Extract docx headers, footers, (formatted) text, footnotes, endnotes, properties, and images"; + changelog = "https://github.com/ShayHill/docx2python/blob/${src.rev}/CHANGELOG.md"; maintainers = [ maintainers.ivar ]; license = licenses.mit; };