From b33c0b61934e290fd2ace0616579f660f608e333 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 13 Aug 2024 04:24:58 -0700 Subject: [PATCH 1/3] python312Packages.pdoc3: 0.10.0 -> 0.11.1 Diff: https://github.com/pdoc3/pdoc/compare/refs/tags/0.10.0...0.11.1 Changelog: https://github.com/pdoc3/pdoc/blob/refs/tags/0.11.1/CHANGELOG --- .../python-modules/pdoc3/default.nix | 44 +++++++------------ 1 file changed, 15 insertions(+), 29 deletions(-) diff --git a/pkgs/development/python-modules/pdoc3/default.nix b/pkgs/development/python-modules/pdoc3/default.nix index e9def284c26c..c568605b16f1 100644 --- a/pkgs/development/python-modules/pdoc3/default.nix +++ b/pkgs/development/python-modules/pdoc3/default.nix @@ -1,8 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, - fetchpatch, + fetchFromGitHub, pythonOlder, mako, markdown, @@ -12,45 +11,32 @@ buildPythonPackage rec { pname = "pdoc3"; - version = "0.10.0"; - format = "setuptools"; - disabled = pythonOlder "3.7"; + version = "0.11.1"; + pyproject = true; + disabled = pythonOlder "3.9"; - src = fetchPypi { - inherit pname version; - hash = "sha256-XyLnvLlpAGc44apCGcdaMvNMLWLUbcnS+y0+CwKH5Lc="; + src = fetchFromGitHub { + owner = "pdoc3"; + repo = "pdoc"; + rev = "refs/tags/${version}"; + hash = "sha256-Opj1fU1eZvqsYJGCBliVwugxFV4H1hzOOTkjs4fOEWA="; }; - patches = [ - (fetchpatch { - # test_Class_params fails in 0.10.0 - # https://github.com/pdoc3/pdoc/issues/355 - url = "https://github.com/pdoc3/pdoc/commit/4aa70de2221a34a3003a7e5f52a9b91965f0e359.patch"; - hash = "sha256-W7Dy516cA+Oj0ZCTQBB6MJ+fCTBeLRp+aW8nANdxSx8="; - }) - # https://github.com/pdoc3/pdoc/issues/400 - (fetchpatch { - name = "fix-test-for-python310.patch"; - url = "https://github.com/pdoc3/pdoc/commit/80af5d40d3ca39e2701c44941c1003ae6a280799.patch"; - hash = "sha256-69Cn+BY7feisSHugONIF/PRgEDEfnvnS/RBHWv1P8/w="; - excludes = [ ".github/workflows/ci.yml" ]; - }) - ]; - - nativeBuildInputs = [ + build-system = [ setuptools-git setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ mako markdown ]; - meta = with lib; { + meta = { + changelog = "https://github.com/pdoc3/pdoc/blob/${src.rev}/CHANGELOG"; description = "Auto-generate API documentation for Python projects"; homepage = "https://pdoc3.github.io/pdoc/"; - license = with licenses; [ agpl3Plus ]; - maintainers = with maintainers; [ catern ]; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ catern ]; }; } From 8105df6639c414b1c72d224b3fc9332cfb62628f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 13 Aug 2024 04:27:25 -0700 Subject: [PATCH 2/3] python312Packages.pdoc3: run tests --- pkgs/development/python-modules/pdoc3/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/pdoc3/default.nix b/pkgs/development/python-modules/pdoc3/default.nix index c568605b16f1..cbdbf7464236 100644 --- a/pkgs/development/python-modules/pdoc3/default.nix +++ b/pkgs/development/python-modules/pdoc3/default.nix @@ -7,6 +7,7 @@ markdown, setuptools-git, setuptools-scm, + unittestCheckHook, }: buildPythonPackage rec { @@ -32,6 +33,10 @@ buildPythonPackage rec { markdown ]; + pythonImportsCheck = [ "pdoc" ]; + + nativeCheckInputs = [ unittestCheckHook ]; + meta = { changelog = "https://github.com/pdoc3/pdoc/blob/${src.rev}/CHANGELOG"; description = "Auto-generate API documentation for Python projects"; From febbe99e783477dc62a10748af0b15a7fd76b743 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 13 Aug 2024 04:28:52 -0700 Subject: [PATCH 3/3] python312Packages.pdoc3: add meta.mainProgram --- pkgs/development/python-modules/pdoc3/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/pdoc3/default.nix b/pkgs/development/python-modules/pdoc3/default.nix index cbdbf7464236..72604e5af492 100644 --- a/pkgs/development/python-modules/pdoc3/default.nix +++ b/pkgs/development/python-modules/pdoc3/default.nix @@ -42,6 +42,7 @@ buildPythonPackage rec { description = "Auto-generate API documentation for Python projects"; homepage = "https://pdoc3.github.io/pdoc/"; license = lib.licenses.agpl3Plus; + mainProgram = "pdoc"; maintainers = with lib.maintainers; [ catern ]; }; }