From 5e0bdebb876ff3b955aae355569ddbde14971490 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Dlouh=C3=BD?= <petr.dlouhy@email.cz>
Date: Fri, 25 Feb 2022 09:40:39 +0100
Subject: [PATCH 1/4] fix installation from source

---
 categories/api/__init__.py |  0
 setup.cfg                  | 13 ++++++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)
 create mode 100644 categories/api/__init__.py

diff --git a/categories/api/__init__.py b/categories/api/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/setup.cfg b/setup.cfg
index 48f6ed5..732f13e 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -25,13 +25,16 @@ classifiers =
 [options]
 zip_safe = False
 include_package_data = True
+packages = find:
 
 [options.packages.find]
-exclude = 
-	example*
-	docs
-	build
-include = categories
+exclude =
+    example*
+    docs
+    build
+include =
+    categories
+    categories.*
 
 [flake8]
 ignore = D203,W503,E501

From d0700892c069a6c58c44f61ff4aefada827b67d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Dlouh=C3=BD?= <petr.dlouhy@email.cz>
Date: Thu, 25 Feb 2021 09:54:49 +0100
Subject: [PATCH 2/4] update gen_coll_tabular.html to new Django versions

---
 categories/templates/admin/edit_inline/gen_coll_tabular.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/categories/templates/admin/edit_inline/gen_coll_tabular.html b/categories/templates/admin/edit_inline/gen_coll_tabular.html
index d6e542c..4d9641d 100644
--- a/categories/templates/admin/edit_inline/gen_coll_tabular.html
+++ b/categories/templates/admin/edit_inline/gen_coll_tabular.html
@@ -1,4 +1,4 @@
-{% load i18n staticfiles %}
+{% load i18n static %}
 <div class="inline-group">
 	<div class="tabular inline-related {% if forloop.last %}last-related{% endif %}">
 		{{ inline_admin_formset.formset.management_form }}
@@ -17,7 +17,7 @@
 					{% if inline_admin_form.form.non_field_errors %}
 						<tr><td colspan="{{ inline_admin_form.field_count }}">{{ inline_admin_form.form.non_field_errors }}</td></tr>
 					{% endif %}
-					<tr class="{% cycle row1,row2 %} {% if inline_admin_form.original or inline_admin_form.show_url %}has_original{% endif %}">
+					<tr class="{% cycle 'row1' 'row2' %} {% if inline_admin_form.original or inline_admin_form.show_url %}has_original{% endif %}">
 						<td class="original">
 							{% if inline_admin_form.original or inline_admin_form.show_url %}<p>
 								{% if inline_admin_form.original %} {{ inline_admin_form.original.content_object }}{% endif %}

From 73142dafae57c35ce8bc55db5fe69e3156c9c346 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Dlouh=C3=BD?= <petr.dlouhy@email.cz>
Date: Thu, 22 Sep 2022 14:00:02 +0200
Subject: [PATCH 3/4] add tests for GenericCollectionInlineModelAdmin

---
 categories/tests/test_admin.py | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/categories/tests/test_admin.py b/categories/tests/test_admin.py
index fdbbd32..f537742 100644
--- a/categories/tests/test_admin.py
+++ b/categories/tests/test_admin.py
@@ -1,5 +1,6 @@
 from django.contrib.auth.models import User
 from django.test import Client, TestCase
+from django.test.utils import override_settings
 from django.urls import reverse
 from django.utils.encoding import smart_str
 
@@ -9,9 +10,9 @@ from categories.models import Category
 class TestCategoryAdmin(TestCase):
     def setUp(self):
         self.client = Client()
+        self.superuser = User.objects.create_superuser("testuser", "testuser@example.com", "password")
 
     def test_adding_parent_and_child(self):
-        User.objects.create_superuser("testuser", "testuser@example.com", "password")
         self.client.login(username="testuser", password="password")
         url = reverse("admin:categories_category_add")
         data = {
@@ -65,3 +66,17 @@ class TestCategoryAdmin(TestCase):
         url = reverse("admin:categories_category_changelist")
         resp = self.client.get(url)
         self.assertEqual(resp.status_code, 200)
+
+    @override_settings(RELATION_MODELS=True)
+    def test_addview_get(self):
+        self.client.force_login(self.superuser)
+        url = reverse("admin:categories_category_add")
+        resp = self.client.get(url)
+        self.assertEqual(resp.status_code, 200)
+        self.assertContains(resp, '<tr class="row1 ">')
+        self.assertContains(
+            resp,
+            '<input type="number" name="categoryrelation_set-0-object_id" class="vIntegerField" '
+            'min="0" id="id_categoryrelation_set-0-object_id">',
+            html=True,
+        )

From b08da9aa4777a112d6559619efdb3e8cc2df548d Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Thu, 22 Sep 2022 12:05:38 +0000
Subject: [PATCH 4/4] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 requirements/dev.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements/dev.txt b/requirements/dev.txt
index bb2758b..e422573 100644
--- a/requirements/dev.txt
+++ b/requirements/dev.txt
@@ -1,6 +1,6 @@
 -r test.txt
 
 bump2version>=1.0.1
-git-fame>=1.12.2
 generate-changelog
+git-fame>=1.12.2
 pre-commit