From 593790625974b2c2eb7b70282d2899c8c585d982 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 28 Sep 2022 09:33:32 +0000 Subject: [PATCH 1/2] python310Packages.sphinxcontrib-autoapi: 1.9.0 -> 2.0.0 --- .../python-modules/sphinxcontrib-autoapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix b/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix index 55feba377d5e..c53a318a7fe7 100644 --- a/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "sphinx-autoapi"; - version = "1.9.0"; + version = "2.0.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-yJfqM33xatDN4wfL3+K+ziB3iN3hWH+k/IuFfR/F3Lo="; + sha256 = "sha256-l9zxtbVM0Njv74Z1lOSk8+LTosDsHlqJHgphvHcEYAY="; }; propagatedBuildInputs = [ astroid jinja2 pyyaml sphinx unidecode ]; From 7b62aa0aa4bfd78d4fa34cc1a1b75946031ac32c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Sep 2022 23:12:29 +0200 Subject: [PATCH 2/2] python310Packages.sphinxcontrib-autoapi: update disabled - switch to pytestCheckHook - add pythonImportsCheck --- .../sphinxcontrib-autoapi/default.nix | 43 +++++++++++-------- 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix b/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix index c53a318a7fe7..26b50d1cb773 100644 --- a/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix @@ -1,45 +1,52 @@ -{ stdenv -, lib +{ lib +, astroid , buildPythonPackage , fetchPypi -, pythonOlder -, astroid , jinja2 -, sphinx -, pyyaml -, unidecode , mock -, pytest +, pytestCheckHook +, pythonOlder +, pyyaml +, sphinx +, stdenv +, unidecode }: buildPythonPackage rec { pname = "sphinx-autoapi"; - version = "2.0.0"; - disabled = pythonOlder "3.6"; + version = "1.9.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-l9zxtbVM0Njv74Z1lOSk8+LTosDsHlqJHgphvHcEYAY="; + hash = "sha256-yJfqM33xatDN4wfL3+K+ziB3iN3hWH+k/IuFfR/F3Lo="; }; - propagatedBuildInputs = [ astroid jinja2 pyyaml sphinx unidecode ]; + propagatedBuildInputs = [ + astroid + jinja2 + pyyaml + sphinx + unidecode + ]; checkInputs = [ mock - pytest + pytestCheckHook ]; - checkPhase = '' - pytest - ''; + pythonImportsCheck = [ + "autoapi" + ]; meta = with lib; { - broken = stdenv.isDarwin; homepage = "https://github.com/readthedocs/sphinx-autoapi"; description = "Provides 'autodoc' style documentation"; longDescription = "Sphinx AutoAPI provides 'autodoc' style documentation for multiple programming languages without needing to load, run, or import the project being documented."; license = licenses.mit; maintainers = with maintainers; [ karolchmist ]; + broken = stdenv.isDarwin; }; - }