From 587963ba53f765c9d7eefbc2fb80bdbb11164850 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Mazzucotelli?= Date: Wed, 19 Jun 2024 16:57:32 +0200 Subject: [PATCH 1/2] fix: Mix both previous checks for displaying objects: not imported or public Issue-294: https://github.com/mkdocstrings/griffe/issues/294 --- .../python/templates/material/_base/children.html.jinja | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mkdocstrings_handlers/python/templates/material/_base/children.html.jinja b/src/mkdocstrings_handlers/python/templates/material/_base/children.html.jinja index 97c276a4..97fc7b57 100644 --- a/src/mkdocstrings_handlers/python/templates/material/_base/children.html.jinja +++ b/src/mkdocstrings_handlers/python/templates/material/_base/children.html.jinja @@ -49,7 +49,7 @@ Context: {% endif %} {% with heading_level = heading_level + extra_level %} {% for attribute in attributes|order_members(config.members_order, members_list) %} - {% if members_list is not none or not attribute.is_imported %} + {% if members_list is not none or (not attribute.is_imported or attribute.is_public) %} {% include attribute|get_template with context %} {% endif %} {% endfor %} @@ -69,7 +69,7 @@ Context: {% endif %} {% with heading_level = heading_level + extra_level %} {% for class in classes|order_members(config.members_order, members_list) %} - {% if members_list is not none or not class.is_imported %} + {% if members_list is not none or (not class.is_imported or class.is_public) %} {% include class|get_template with context %} {% endif %} {% endfor %} @@ -90,7 +90,7 @@ Context: {% with heading_level = heading_level + extra_level %} {% for function in functions|order_members(config.members_order, members_list) %} {% if not (obj.kind.value == "class" and function.name == "__init__" and config.merge_init_into_class) %} - {% if members_list is not none or not function.is_imported %} + {% if members_list is not none or (not function.is_imported or function.is_public) %} {% include function|get_template with context %} {% endif %} {% endif %} @@ -112,7 +112,7 @@ Context: {% endif %} {% with heading_level = heading_level + extra_level %} {% for module in modules|order_members(config.members_order.alphabetical, members_list) %} - {% if members_list is not none or not module.is_alias %} + {% if members_list is not none or (not module.is_alias or module.is_public) %} {% include module|get_template with context %} {% endif %} {% endfor %} From ce91d88c18657dc3135cdd58becfa65a0252e941 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Mazzucotelli?= Date: Wed, 19 Jun 2024 16:59:53 +0200 Subject: [PATCH 2/2] chore: Prepare release 1.10.5 --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 59e91671..91124a48 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,14 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [1.10.5](https://github.com/mkdocstrings/python/releases/tag/1.10.5) - 2024-06-19 + +[Compare with 1.10.4](https://github.com/mkdocstrings/python/compare/1.10.4...1.10.5) + +### Bug Fixes + +- Mix both previous checks for displaying objects: not imported or public ([587963b](https://github.com/mkdocstrings/python/commit/587963ba53f765c9d7eefbc2fb80bdbb11164850) by Timothée Mazzucotelli). [Issue-294](https://github.com/mkdocstrings/griffe/issues/294) + ## [1.10.4](https://github.com/mkdocstrings/python/releases/tag/1.10.4) - 2024-06-18 [Compare with 1.10.3](https://github.com/mkdocstrings/python/compare/1.10.3...1.10.4)