diff --git a/textproc/py-sphinx-automodapi/Makefile b/textproc/py-sphinx-automodapi/Makefile
index 2cd83ab225d..c5a53bc6bde 100644
--- a/textproc/py-sphinx-automodapi/Makefile
+++ b/textproc/py-sphinx-automodapi/Makefile
@@ -1,8 +1,7 @@
 COMMENT=	auto-generate API documentation for entire modules in Sphinx
 
-MODPY_DISTV=	0.17.0
-REVISION=	2
-DISTNAME=	sphinx-automodapi-${MODPY_DISTV}
+MODPY_DISTV=	0.22.0
+DISTNAME=	sphinx_automodapi-${MODPY_DISTV}
 PKGNAME=	py-sphinx-automodapi-${MODPY_DISTV}
 
 CATEGORIES=	textproc
diff --git a/textproc/py-sphinx-automodapi/distinfo b/textproc/py-sphinx-automodapi/distinfo
index cf00c810cdf..911475b394e 100644
--- a/textproc/py-sphinx-automodapi/distinfo
+++ b/textproc/py-sphinx-automodapi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (sphinx-automodapi-0.17.0.tar.gz) = fM2trVet1KqRSdnyu1zyjI+LWQKAtHNbEVbqg1XEI6E=
-SIZE (sphinx-automodapi-0.17.0.tar.gz) = 49688
+SHA256 (sphinx_automodapi-0.22.0.tar.gz) = mmdF1gbrlIMh8Lt71FEdxthIHaiBnKoWBNcTiRAXOzg=
+SIZE (sphinx_automodapi-0.22.0.tar.gz) = 56683
diff --git a/textproc/py-sphinx-automodapi/pkg/PLIST b/textproc/py-sphinx-automodapi/pkg/PLIST
index 6d9abcd8643..7b663c6482c 100644
--- a/textproc/py-sphinx-automodapi/pkg/PLIST
+++ b/textproc/py-sphinx-automodapi/pkg/PLIST
@@ -54,40 +54,76 @@ lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/abstract_
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/abstract_classes/README.md
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/abstract_classes/input/
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/abstract_classes/input/index.rst
-lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/abstract_classes/output/
-lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/abstract_classes/output/api/
-lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/abstract_classes/output/api/sphinx_automodapi.tests.example_module.abstract_classes.SequenceSubclass.rst
-lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/abstract_classes/output/index.rst.automodapi
-lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/abstract_classes/output/index.rst.automodsumm
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/abstract_classes/output_prop_is_attr/
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/abstract_classes/output_prop_is_attr/api/
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/abstract_classes/output_prop_is_attr/api/sphinx_automodapi.tests.example_module.abstract_classes.SequenceSubclass.rst
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/abstract_classes/output_prop_is_attr/index.rst.automodapi
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/abstract_classes/output_prop_is_attr/index.rst.automodsumm
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/abstract_classes/output_prop_is_not_attr/
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/abstract_classes/output_prop_is_not_attr/api/
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/abstract_classes/output_prop_is_not_attr/api/sphinx_automodapi.tests.example_module.abstract_classes.SequenceSubclass.rst
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/abstract_classes/output_prop_is_not_attr/index.rst.automodapi
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/abstract_classes/output_prop_is_not_attr/index.rst.automodsumm
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/allowed_names/
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/allowed_names/README.md
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/allowed_names/input/
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/allowed_names/input/index.rst
-lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/allowed_names/output/
-lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/allowed_names/output/api/
-lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/allowed_names/output/api/sphinx_automodapi.tests.example_module.Egg.rst
-lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/allowed_names/output/api/sphinx_automodapi.tests.example_module.Spam.rst
-lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/allowed_names/output/index.rst.automodapi
-lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/allowed_names/output/index.rst.automodsumm
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/allowed_names/output_prop_is_attr/
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/allowed_names/output_prop_is_attr/api/
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/allowed_names/output_prop_is_attr/api/sphinx_automodapi.tests.example_module.Egg.rst
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/allowed_names/output_prop_is_attr/api/sphinx_automodapi.tests.example_module.Spam.rst
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/allowed_names/output_prop_is_attr/index.rst.automodapi
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/allowed_names/output_prop_is_attr/index.rst.automodsumm
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/allowed_names/output_prop_is_not_attr/
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/allowed_names/output_prop_is_not_attr/api/
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/allowed_names/output_prop_is_not_attr/api/sphinx_automodapi.tests.example_module.Egg.rst
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/allowed_names/output_prop_is_not_attr/api/sphinx_automodapi.tests.example_module.Spam.rst
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/allowed_names/output_prop_is_not_attr/index.rst.automodapi
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/allowed_names/output_prop_is_not_attr/index.rst.automodsumm
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/attribute_class/
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/attribute_class/README.md
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/attribute_class/input/
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/attribute_class/input/index.rst
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/attribute_class/output_prop_is_attr/
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/attribute_class/output_prop_is_attr/api/
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/attribute_class/output_prop_is_attr/api/sphinx_automodapi.tests.example_module.attribute_class.ClassWithAttribute.rst
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/attribute_class/output_prop_is_attr/index.rst.automodapi
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/attribute_class/output_prop_is_attr/index.rst.automodsumm
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/attribute_class/output_prop_is_not_attr/
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/attribute_class/output_prop_is_not_attr/api/
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/attribute_class/output_prop_is_not_attr/api/sphinx_automodapi.tests.example_module.attribute_class.ClassWithAttribute.rst
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/attribute_class/output_prop_is_not_attr/index.rst.automodapi
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/attribute_class/output_prop_is_not_attr/index.rst.automodsumm
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/classes_no_inherit/
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/classes_no_inherit/README.md
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/classes_no_inherit/input/
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/classes_no_inherit/input/index.rst
-lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/classes_no_inherit/output/
-lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/classes_no_inherit/output/api/
-lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/classes_no_inherit/output/api/sphinx_automodapi.tests.example_module.classes.Egg.rst
-lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/classes_no_inherit/output/index.rst.automodapi
-lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/classes_no_inherit/output/index.rst.automodsumm
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/classes_no_inherit/output_prop_is_attr/
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/classes_no_inherit/output_prop_is_attr/api/
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/classes_no_inherit/output_prop_is_attr/api/sphinx_automodapi.tests.example_module.classes.Egg.rst
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/classes_no_inherit/output_prop_is_attr/index.rst.automodapi
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/classes_no_inherit/output_prop_is_attr/index.rst.automodsumm
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/classes_no_inherit/output_prop_is_not_attr/
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/classes_no_inherit/output_prop_is_not_attr/api/
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/classes_no_inherit/output_prop_is_not_attr/api/sphinx_automodapi.tests.example_module.classes.Egg.rst
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/classes_no_inherit/output_prop_is_not_attr/index.rst.automodapi
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/classes_no_inherit/output_prop_is_not_attr/index.rst.automodsumm
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/classes_with_inherit/
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/classes_with_inherit/README.md
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/classes_with_inherit/input/
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/classes_with_inherit/input/index.rst
-lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/classes_with_inherit/output/
-lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/classes_with_inherit/output/api/
-lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/classes_with_inherit/output/api/sphinx_automodapi.tests.example_module.classes.Egg.rst
-lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/classes_with_inherit/output/api/sphinx_automodapi.tests.example_module.classes.Spam.rst
-lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/classes_with_inherit/output/index.rst.automodapi
-lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/classes_with_inherit/output/index.rst.automodsumm
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/classes_with_inherit/output_prop_is_attr/
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/classes_with_inherit/output_prop_is_attr/api/
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/classes_with_inherit/output_prop_is_attr/api/sphinx_automodapi.tests.example_module.classes.Egg.rst
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/classes_with_inherit/output_prop_is_attr/api/sphinx_automodapi.tests.example_module.classes.Spam.rst
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/classes_with_inherit/output_prop_is_attr/index.rst.automodapi
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/classes_with_inherit/output_prop_is_attr/index.rst.automodsumm
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/classes_with_inherit/output_prop_is_not_attr/
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/classes_with_inherit/output_prop_is_not_attr/api/
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/classes_with_inherit/output_prop_is_not_attr/api/sphinx_automodapi.tests.example_module.classes.Egg.rst
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/classes_with_inherit/output_prop_is_not_attr/api/sphinx_automodapi.tests.example_module.classes.Spam.rst
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/classes_with_inherit/output_prop_is_not_attr/index.rst.automodapi
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/classes_with_inherit/output_prop_is_not_attr/index.rst.automodsumm
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/func_headings/
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/func_headings/README.md
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/func_headings/input/
@@ -132,51 +168,84 @@ lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/inherited
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/inherited_members/README.md
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/inherited_members/input/
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/inherited_members/input/index.rst
-lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/inherited_members/output/
-lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/inherited_members/output/api/
-lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/inherited_members/output/api/sphinx_automodapi.tests.example_module.classes.Egg.rst
-lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/inherited_members/output/api/sphinx_automodapi.tests.example_module.classes.Spam.rst
-lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/inherited_members/output/api/sphinx_automodapi.tests.example_module.other_classes.Foo.rst
-lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/inherited_members/output/index.rst.automodapi
-lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/inherited_members/output/index.rst.automodsumm
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/inherited_members/output_prop_is_attr/
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/inherited_members/output_prop_is_attr/api/
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/inherited_members/output_prop_is_attr/api/sphinx_automodapi.tests.example_module.classes.Egg.rst
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/inherited_members/output_prop_is_attr/api/sphinx_automodapi.tests.example_module.classes.Spam.rst
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/inherited_members/output_prop_is_attr/api/sphinx_automodapi.tests.example_module.other_classes.Foo.rst
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/inherited_members/output_prop_is_attr/index.rst.automodapi
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/inherited_members/output_prop_is_attr/index.rst.automodsumm
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/inherited_members/output_prop_is_not_attr/
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/inherited_members/output_prop_is_not_attr/api/
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/inherited_members/output_prop_is_not_attr/api/sphinx_automodapi.tests.example_module.classes.Egg.rst
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/inherited_members/output_prop_is_not_attr/api/sphinx_automodapi.tests.example_module.classes.Spam.rst
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/inherited_members/output_prop_is_not_attr/api/sphinx_automodapi.tests.example_module.other_classes.Foo.rst
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/inherited_members/output_prop_is_not_attr/index.rst.automodapi
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/inherited_members/output_prop_is_not_attr/index.rst.automodsumm
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel/
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel/README.md
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel/input/
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel/input/index.rst
-lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel/output/
-lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel/output/api/
-lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel/output/api/sphinx_automodapi.tests.example_module.Egg.rst
-lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel/output/api/sphinx_automodapi.tests.example_module.Spam.rst
-lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel/output/api/sphinx_automodapi.tests.example_module.add.rst
-lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel/output/api/sphinx_automodapi.tests.example_module.multiply.rst
-lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel/output/index.rst.automodapi
-lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel/output/index.rst.automodsumm
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel/output_prop_is_attr/
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel/output_prop_is_attr/api/
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel/output_prop_is_attr/api/sphinx_automodapi.tests.example_module.Egg.rst
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel/output_prop_is_attr/api/sphinx_automodapi.tests.example_module.Spam.rst
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel/output_prop_is_attr/api/sphinx_automodapi.tests.example_module.add.rst
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel/output_prop_is_attr/api/sphinx_automodapi.tests.example_module.multiply.rst
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel/output_prop_is_attr/index.rst.automodapi
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel/output_prop_is_attr/index.rst.automodsumm
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel/output_prop_is_not_attr/
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel/output_prop_is_not_attr/api/
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel/output_prop_is_not_attr/api/sphinx_automodapi.tests.example_module.Egg.rst
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel/output_prop_is_not_attr/api/sphinx_automodapi.tests.example_module.Spam.rst
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel/output_prop_is_not_attr/api/sphinx_automodapi.tests.example_module.add.rst
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel/output_prop_is_not_attr/api/sphinx_automodapi.tests.example_module.multiply.rst
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel/output_prop_is_not_attr/index.rst.automodapi
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel/output_prop_is_not_attr/index.rst.automodsumm
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel_all_objects/
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel_all_objects/README.md
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel_all_objects/input/
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel_all_objects/input/index.rst
-lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel_all_objects/output/
-lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel_all_objects/output/api/
-lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel_all_objects/output/api/sphinx_automodapi.tests.example_module.Egg.rst
-lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel_all_objects/output/api/sphinx_automodapi.tests.example_module.FUNNY_WALK_STEPS.rst
-lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel_all_objects/output/api/sphinx_automodapi.tests.example_module.PARROT_STATE.rst
-lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel_all_objects/output/api/sphinx_automodapi.tests.example_module.Spam.rst
-lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel_all_objects/output/api/sphinx_automodapi.tests.example_module.add.rst
-lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel_all_objects/output/api/sphinx_automodapi.tests.example_module.multiply.rst
-lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel_all_objects/output/index.rst.automodapi
-lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel_all_objects/output/index.rst.automodsumm
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel_all_objects/output_prop_is_attr/
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel_all_objects/output_prop_is_attr/api/
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel_all_objects/output_prop_is_attr/api/sphinx_automodapi.tests.example_module.Egg.rst
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel_all_objects/output_prop_is_attr/api/sphinx_automodapi.tests.example_module.FUNNY_WALK_STEPS.rst
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel_all_objects/output_prop_is_attr/api/sphinx_automodapi.tests.example_module.PARROT_STATE.rst
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel_all_objects/output_prop_is_attr/api/sphinx_automodapi.tests.example_module.Spam.rst
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel_all_objects/output_prop_is_attr/api/sphinx_automodapi.tests.example_module.add.rst
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel_all_objects/output_prop_is_attr/api/sphinx_automodapi.tests.example_module.multiply.rst
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel_all_objects/output_prop_is_attr/index.rst.automodapi
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel_all_objects/output_prop_is_attr/index.rst.automodsumm
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel_all_objects/output_prop_is_not_attr/
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel_all_objects/output_prop_is_not_attr/api/
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel_all_objects/output_prop_is_not_attr/api/sphinx_automodapi.tests.example_module.Egg.rst
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel_all_objects/output_prop_is_not_attr/api/sphinx_automodapi.tests.example_module.FUNNY_WALK_STEPS.rst
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel_all_objects/output_prop_is_not_attr/api/sphinx_automodapi.tests.example_module.PARROT_STATE.rst
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel_all_objects/output_prop_is_not_attr/api/sphinx_automodapi.tests.example_module.Spam.rst
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel_all_objects/output_prop_is_not_attr/api/sphinx_automodapi.tests.example_module.add.rst
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel_all_objects/output_prop_is_not_attr/api/sphinx_automodapi.tests.example_module.multiply.rst
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel_all_objects/output_prop_is_not_attr/index.rst.automodapi
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel_all_objects/output_prop_is_not_attr/index.rst.automodsumm
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel_nodiagram/
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel_nodiagram/README.md
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel_nodiagram/input/
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel_nodiagram/input/index.rst
-lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel_nodiagram/output/
-lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel_nodiagram/output/api/
-lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel_nodiagram/output/api/sphinx_automodapi.tests.example_module.Egg.rst
-lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel_nodiagram/output/api/sphinx_automodapi.tests.example_module.Spam.rst
-lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel_nodiagram/output/api/sphinx_automodapi.tests.example_module.add.rst
-lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel_nodiagram/output/api/sphinx_automodapi.tests.example_module.multiply.rst
-lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel_nodiagram/output/index.rst.automodapi
-lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel_nodiagram/output/index.rst.automodsumm
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel_nodiagram/output_prop_is_attr/
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel_nodiagram/output_prop_is_attr/api/
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel_nodiagram/output_prop_is_attr/api/sphinx_automodapi.tests.example_module.Egg.rst
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel_nodiagram/output_prop_is_attr/api/sphinx_automodapi.tests.example_module.Spam.rst
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel_nodiagram/output_prop_is_attr/api/sphinx_automodapi.tests.example_module.add.rst
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel_nodiagram/output_prop_is_attr/api/sphinx_automodapi.tests.example_module.multiply.rst
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel_nodiagram/output_prop_is_attr/index.rst.automodapi
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel_nodiagram/output_prop_is_attr/index.rst.automodsumm
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel_nodiagram/output_prop_is_not_attr/
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel_nodiagram/output_prop_is_not_attr/api/
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel_nodiagram/output_prop_is_not_attr/api/sphinx_automodapi.tests.example_module.Egg.rst
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel_nodiagram/output_prop_is_not_attr/api/sphinx_automodapi.tests.example_module.Spam.rst
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel_nodiagram/output_prop_is_not_attr/api/sphinx_automodapi.tests.example_module.add.rst
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel_nodiagram/output_prop_is_not_attr/api/sphinx_automodapi.tests.example_module.multiply.rst
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel_nodiagram/output_prop_is_not_attr/index.rst.automodapi
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/mixed_toplevel_nodiagram/output_prop_is_not_attr/index.rst.automodsumm
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/nested/
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/nested/README.md
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/nested/input/
@@ -204,6 +273,16 @@ lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/non_ascii
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/non_ascii/output/api/sphinx_automodapi.tests.example_module.nonascii.NonAsciiÄöüßő.rst
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/non_ascii/output/index.rst.automodapi
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/non_ascii/output/index.rst.automodsumm
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/public_from_private/
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/public_from_private/README.md
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/public_from_private/input/
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/public_from_private/input/index.rst
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/public_from_private/output/
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/public_from_private/output/api/
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/public_from_private/output/api/sphinx_automodapi.tests.example_module.public.Camelot.rst
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/public_from_private/output/api/sphinx_automodapi.tests.example_module.public.Spam.rst
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/public_from_private/output/index.rst.automodapi
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/public_from_private/output/index.rst.automodsumm
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/slots/
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/slots/README.md
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/cases/slots/input/
@@ -267,8 +346,12 @@ lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/example_module/
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/example_module/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/example_module/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/example_module/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/example_module/${MODPY_PYCACHE}_private.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/example_module/${MODPY_PYCACHE}_private.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/example_module/${MODPY_PYCACHE}abstract_classes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/example_module/${MODPY_PYCACHE}abstract_classes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/example_module/${MODPY_PYCACHE}attribute_class.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/example_module/${MODPY_PYCACHE}attribute_class.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/example_module/${MODPY_PYCACHE}classes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/example_module/${MODPY_PYCACHE}classes.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/example_module/${MODPY_PYCACHE}functions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -283,13 +366,17 @@ lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/example_module/
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/example_module/${MODPY_PYCACHE}nonascii.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/example_module/${MODPY_PYCACHE}other_classes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/example_module/${MODPY_PYCACHE}other_classes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/example_module/${MODPY_PYCACHE}public.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/example_module/${MODPY_PYCACHE}public.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/example_module/${MODPY_PYCACHE}slots.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/example_module/${MODPY_PYCACHE}slots.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/example_module/${MODPY_PYCACHE}stdlib.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/example_module/${MODPY_PYCACHE}stdlib.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/example_module/${MODPY_PYCACHE}variables.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/example_module/${MODPY_PYCACHE}variables.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/example_module/_private.py
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/example_module/abstract_classes.py
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/example_module/attribute_class.py
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/example_module/classes.py
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/example_module/functions.py
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/example_module/functions_with_ref.py
@@ -297,6 +384,7 @@ lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/example_module/
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/example_module/noall.py
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/example_module/nonascii.py
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/example_module/other_classes.py
+lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/example_module/public.py
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/example_module/slots.py
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/example_module/stdlib.py
 lib/python${MODPY_VERSION}/site-packages/sphinx_automodapi/tests/example_module/variables.py