PyInventory 0.21.2__tar.gz → 0.21.4__tar.gz

{pyinventory-0.21.2 → pyinventory-0.21.4}/.editorconfig

@@ -15,9 +15,5 @@ insert_final_newline = false
 [*.py]
 max_line_length = 119
 
-[{Makefile,**.mk}]
-indent_style = tab
-insert_final_newline = false
-
 [{*.yaml,*.yml}]
 indent_size = 2

{pyinventory-0.21.2 → pyinventory-0.21.4}/.gitignore

@@ -7,6 +7,7 @@ __pycache__
 *.orig
 
 !.github
+!.run
 !.editorconfig
 !.flake8
 !.gitignore

{pyinventory-0.21.2 → pyinventory-0.21.4}/.pre-commit-config.yaml

@@ -1,13 +1,7 @@
 # pre-commit plugin configuration
 # See https://pre-commit.com for more information
-default_install_hook_types:
-  - prepare-commit-msg
-  - post-commit
-  - post-rewrite
-  - pre-push
-
 repos:
   - repo: https://github.com/jedie/cli-base-utilities
-    rev: v0.23.0
+    rev: v0.23.3
     hooks:
       - id: update-readme-history

pyinventory-0.21.4/.run/Template Django tests.run.xml

@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="true" type="DjangoTestsConfigurationType">
+    <module name="PyInventory" />
+    <option name="ENV_FILES" value="" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+      <env name="DJANGO_SETTINGS_MODULE" value="inventory_project.settings.tests" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="true" />
+    <option name="ADD_CONTENT_ROOTS" value="false" />
+    <option name="ADD_SOURCE_ROOTS" value="false" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+    <option name="TARGET" value="" />
+    <option name="SETTINGS_FILE" value="" />
+    <option name="CUSTOM_SETTINGS" value="false" />
+    <option name="USE_OPTIONS" value="false" />
+    <option name="OPTIONS" value="" />
+    <method v="2" />
+  </configuration>
+</component>

pyinventory-0.21.4/.run/Template Python.run.xml

@@ -0,0 +1,26 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="true" type="PythonConfigurationType" factoryName="Python">
+    <module name="PyInventory" />
+    <option name="ENV_FILES" value="" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="SDK_NAME" value="Python 3.12 (pyinventory_ynh)" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="false" />
+    <option name="ADD_CONTENT_ROOTS" value="false" />
+    <option name="ADD_SOURCE_ROOTS" value="false" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+    <option name="SCRIPT_NAME" value="" />
+    <option name="PARAMETERS" value="" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="true" />
+    <option name="MODULE_MODE" value="false" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
+</component>

pyinventory-0.21.4/.run/manage.py --help.run.xml

@@ -0,0 +1,25 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="manage.py --help" type="PythonConfigurationType" factoryName="Python">
+    <module name="PyInventory" />
+    <option name="ENV_FILES" value="" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="true" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/manage.py" />
+    <option name="PARAMETERS" value="--help" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="true" />
+    <option name="MODULE_MODE" value="false" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
+</component>

pyinventory-0.21.4/.run/manage.py update_req.run.xml

@@ -0,0 +1,25 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="manage.py update_req" type="PythonConfigurationType" factoryName="Python">
+    <module name="PyInventory" />
+    <option name="ENV_FILES" value="" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="true" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/manage.py" />
+    <option name="PARAMETERS" value="update_req" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="true" />
+    <option name="MODULE_MODE" value="false" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
+</component>

pyinventory-0.21.4/.run/unittests ___all___.run.xml

@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="unittests ***all***" type="DjangoTestsConfigurationType">
+    <module name="PyInventory" />
+    <option name="ENV_FILES" value="" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+      <env name="DJANGO_SETTINGS_MODULE" value="inventory_project.settings.tests" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="true" />
+    <option name="ADD_CONTENT_ROOTS" value="false" />
+    <option name="ADD_SOURCE_ROOTS" value="false" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+    <option name="TARGET" value="" />
+    <option name="SETTINGS_FILE" value="" />
+    <option name="CUSTOM_SETTINGS" value="false" />
+    <option name="USE_OPTIONS" value="false" />
+    <option name="OPTIONS" value="" />
+    <method v="2" />
+  </configuration>
+</component>

{pyinventory-0.21.2 → pyinventory-0.21.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyInventory
-Version: 0.21.2
+Version: 0.21.4
 Summary: Web based management to catalog things including state and location etc. using Python/Django.
 Project-URL: Documentation, https://github.com/jedie/PyInventory
 Project-URL: Source, https://github.com/jedie/PyInventory
@@ -196,20 +196,34 @@ To make a new release, do this:
 
 [comment]: <> (✂✂✂ auto generated history start ✂✂✂)
 
+* [v0.21.4](https://github.com/jedie/PyInventory/compare/v0.21.3...v0.21.4)
+  * 2025-09-21 - Because of PyPi download errors: release as v0.21.4
+* [v0.21.3](https://github.com/jedie/PyInventory/compare/v0.21.2...v0.21.3)
+  * 2025-09-21 - Enhance change list filters by using RelatedOnlyFieldListFilter
+  * 2025-09-21 - Update requirements
+  * 2025-09-21 - Bugfix Memo changelist ordering
+  * 2025-09-20 - Code cleanup: Use format_html() with kwargs
+  * 2025-09-20 - Add type hints
+  * 2025-09-20 - Cleanup: We didn't have make files
+  * 2025-09-20 - Cleanup: Remove obsolete files
+  * 2025-09-20 - Add PyCharm run configs
+  * 2025-09-20 - pre-commit: remove "default_install_hook_types"
+  * 2025-09-20 - Remove obsolete config files
+  * 2025-09-20 - Update ReadmeHistoryTestCase
 * [v0.21.2](https://github.com/jedie/PyInventory/compare/v0.21.1...v0.21.2)
   * 2025-09-09 - Update project, e.g.: Darker -> Ruff and fix tests
   * 2025-05-01 - Fix local dev server: Don't enforce https
 * [v0.21.1](https://github.com/jedie/PyInventory/compare/v0.21.0...v0.21.1)
   * 2025-05-01 - Replace setuptools with hatchling
   * 2025-04-30 - Update requirements and some small code parts
+
+<details><summary>Expand older history entries ...</summary>
+
 * [v0.21.0](https://github.com/jedie/PyInventory/compare/v0.20.1...v0.21.0)
   * 2025-03-23 - Bugfix publish: setuptools missing
   * 2025-03-23 - Migrate "pip-tools" -> "uv" and remove tox
 * [v0.20.1](https://github.com/jedie/PyInventory/compare/v0.20.0...v0.20.1)
   * 2024-09-05 - switched to https://github.com/jazzband/django-tinymce/
-
-<details><summary>Expand older history entries ...</summary>
-
 * [v0.20.0](https://github.com/jedie/PyInventory/compare/v0.19.3...v0.20.0)
   * 2024-09-05 - Replace django-ckeditor with django-prose-editor and fix tests
   * 2024-09-05 - Project updates

{pyinventory-0.21.2 → pyinventory-0.21.4}/README.md

@@ -166,20 +166,34 @@ To make a new release, do this:
 
 [comment]: <> (✂✂✂ auto generated history start ✂✂✂)
 
+* [v0.21.4](https://github.com/jedie/PyInventory/compare/v0.21.3...v0.21.4)
+  * 2025-09-21 - Because of PyPi download errors: release as v0.21.4
+* [v0.21.3](https://github.com/jedie/PyInventory/compare/v0.21.2...v0.21.3)
+  * 2025-09-21 - Enhance change list filters by using RelatedOnlyFieldListFilter
+  * 2025-09-21 - Update requirements
+  * 2025-09-21 - Bugfix Memo changelist ordering
+  * 2025-09-20 - Code cleanup: Use format_html() with kwargs
+  * 2025-09-20 - Add type hints
+  * 2025-09-20 - Cleanup: We didn't have make files
+  * 2025-09-20 - Cleanup: Remove obsolete files
+  * 2025-09-20 - Add PyCharm run configs
+  * 2025-09-20 - pre-commit: remove "default_install_hook_types"
+  * 2025-09-20 - Remove obsolete config files
+  * 2025-09-20 - Update ReadmeHistoryTestCase
 * [v0.21.2](https://github.com/jedie/PyInventory/compare/v0.21.1...v0.21.2)
   * 2025-09-09 - Update project, e.g.: Darker -> Ruff and fix tests
   * 2025-05-01 - Fix local dev server: Don't enforce https
 * [v0.21.1](https://github.com/jedie/PyInventory/compare/v0.21.0...v0.21.1)
   * 2025-05-01 - Replace setuptools with hatchling
   * 2025-04-30 - Update requirements and some small code parts
+
+<details><summary>Expand older history entries ...</summary>
+
 * [v0.21.0](https://github.com/jedie/PyInventory/compare/v0.20.1...v0.21.0)
   * 2025-03-23 - Bugfix publish: setuptools missing
   * 2025-03-23 - Migrate "pip-tools" -> "uv" and remove tox
 * [v0.20.1](https://github.com/jedie/PyInventory/compare/v0.20.0...v0.20.1)
   * 2024-09-05 - switched to https://github.com/jazzband/django-tinymce/
-
-<details><summary>Expand older history entries ...</summary>
-
 * [v0.20.0](https://github.com/jedie/PyInventory/compare/v0.19.3...v0.20.0)
   * 2024-09-05 - Replace django-ckeditor with django-prose-editor and fix tests
   * 2024-09-05 - Project updates

{pyinventory-0.21.2 → pyinventory-0.21.4}/inventory/__init__.py

@@ -8,5 +8,5 @@
 """
 
 # See https://packaging.python.org/en/latest/specifications/version-specifiers/
-__version__ = '0.21.2'
+__version__ = '0.21.4'
 __author__ = 'Jens Diemer <PyInventory@jensdiemer.de>'

{pyinventory-0.21.2 → pyinventory-0.21.4}/inventory/admin/base.py

@@ -49,7 +49,7 @@ class BaseUserAdmin(CompareVersionAdmin):
         if request.user.is_superuser:
             # Superuser sees entries from all users -> Add "By user" filter
             list_filter = list(list_filter)
-            list_filter.insert(0, 'user')
+            list_filter.insert(0, ('user', admin.RelatedOnlyFieldListFilter))
 
         return list_filter
 
@@ -67,7 +67,7 @@ class BaseUserAdmin(CompareVersionAdmin):
 class BaseImageModelInline(UserInlineMixin, SortableInlineAdminMixin, admin.TabularInline):
     def preview(self, instance):
         return format_html(
-            (
+            format_string=(
                 '<a href="{url}" title="{name}"'
                 ' target="_blank" class="image_file_input_preview">'
                 '<img style="width:9em;" src="{url}"></a>'

{pyinventory-0.21.2 → pyinventory-0.21.4}/inventory/admin/item.py

@@ -71,10 +71,10 @@ class ItemModelAdmin(TagulousModelAdminFix, ImportExportMixin, SortableAdminMixi
         item = path[-1]
         url = reverse('admin:inventory_itemmodel_change', args=[obj.pk])
         return format_html(
-            '<a href="{}">{}<strong>{}</strong></a>',
-            url,
-            prefixes,
-            item,
+            format_string='<a href="{url}">{prefixes}<strong>{item}</strong></a>',
+            url=url,
+            prefixes=prefixes,
+            item=item,
         )
 
     def get_queryset(self, request):
@@ -94,7 +94,13 @@ class ItemModelAdmin(TagulousModelAdminFix, ImportExportMixin, SortableAdminMixi
     list_display = ('producer', 'item', 'kind', 'location', 'received_date', 'update_dt')
     ordering = ('path_str',)
     list_display_links = ()
-    list_filter = (LimitTreeDepthListFilter, 'kind', 'location', 'producer', 'tags')
+    list_filter = (
+        LimitTreeDepthListFilter,
+        ('kind', admin.RelatedOnlyFieldListFilter),
+        ('location', admin.RelatedOnlyFieldListFilter),
+        ('producer', admin.RelatedOnlyFieldListFilter),
+        ('tags', admin.RelatedOnlyFieldListFilter),
+    )
     search_fields = ('name', 'description', 'kind__name', 'tags__name')
     fieldsets = (
         (

{pyinventory-0.21.2 → pyinventory-0.21.4}/inventory/admin/memo.py

@@ -1,7 +1,7 @@
 import logging
 
 import tagulous
-from adminsortable2.admin import SortableAdminMixin, SortableInlineAdminMixin
+from adminsortable2.admin import SortableAdminBase, SortableInlineAdminMixin
 from django.contrib import admin
 from django.utils.translation import gettext_lazy as _
 from import_export.admin import ImportExportMixin
@@ -35,7 +35,7 @@ class MemoModelResource(ModelResource):
 
 
 @admin.register(MemoModel)
-class MemoModelAdmin(TagulousModelAdminFix, ImportExportMixin, SortableAdminMixin, BaseUserAdmin):
+class MemoModelAdmin(TagulousModelAdminFix, ImportExportMixin, SortableAdminBase, BaseUserAdmin):
     def get_max_order(self, request, obj=None):
         # Work-a-round for: https://github.com/jrief/django-admin-sortable2/issues/341
         return 0
@@ -44,7 +44,7 @@ class MemoModelAdmin(TagulousModelAdminFix, ImportExportMixin, SortableAdminMixi
     list_display = ('name', 'update_dt')
     ordering = ('-update_dt',)
     list_display_links = ('name',)
-    list_filter = ('tags',)
+    list_filter = (('tags', admin.RelatedOnlyFieldListFilter),)
     search_fields = ('name', 'memo', 'tags__name')
     fieldsets = (
         (

{pyinventory-0.21.2 → pyinventory-0.21.4}/inventory/forms.py

@@ -1,5 +1,7 @@
 from django import forms
 from django.core.exceptions import FieldDoesNotExist
+from django.db.models import QuerySet
+from django.db.models.options import Options
 
 from inventory.request_dict import get_request_dict
 
@@ -17,8 +19,8 @@ class OnlyUserRelationsModelForm(forms.ModelForm):
             if not hasattr(formfield, 'queryset'):
                 continue
 
-            queryset = formfield.queryset
-            opts = queryset.model._meta
+            queryset: QuerySet = formfield.queryset
+            opts: Options = queryset.model._meta
             try:
                 opts.get_field('user')
             except FieldDoesNotExist:

pyinventory-0.21.4/inventory_project/tests/test_readme_history.py

@@ -0,0 +1,15 @@
+from unittest import TestCase, skipIf
+
+from cli_base.cli_tools.constants import GITHUB_ACTION
+from cli_base.cli_tools.git_history import update_readme_history
+
+
+class ReadmeHistoryTestCase(TestCase):
+    @skipIf(
+        # After a release the history may be "changed" because of version bump.
+        # We should not block merge requests because of this.
+        GITHUB_ACTION,
+        reason='Skip on github actions',
+    )
+    def test_readme_history(self):
+        update_readme_history(raise_update_error=True)