Merge branches together

src/djangocms_snippet/admin.py

@@ -1,5 +1,3 @@
-from typing import ClassVar
-
 from cms.utils import get_current_site
 from cms.utils.permissions import get_model_permission_codename
 from typing import Any, ClassVar
@@ -43,7 +41,7 @@ class Media:
             else "https://cdnjs.cloudflare.com/ajax/libs/ace/1.9.6/ace.js",
         )
 
-    list_display = ("slug", "name")
+    list_display = ("name",)
     search_fields: ClassVar[list[str]] = ['name']
     text_area_attrs: ClassVar[dict[str, Any]] = {
         'rows': 20,

src/djangocms_snippet/migrations/0014_merge_20240519_2117.py

@@ -5,7 +5,7 @@
 
 class Migration(migrations.Migration):
     dependencies = [
-        ("djangocms_snippet", "0009_alter_snippetptr_cmsplugin_ptr"),
+        ("djangocms_snippet", "0010_alter_snippet_id"),
         ("djangocms_snippet", "0013_snippet_site"),
     ]
 
@@ -30,4 +30,11 @@ class Migration(migrations.Migration):
                 default="", max_length=255, verbose_name="Slug"
             ),
         ),
+        migrations.AlterField(
+            model_name="snippetgrouper",
+            name="id",
+            field=models.BigAutoField(
+                auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
+            ),
+        ),
     ]

tox.ini

@@ -37,13 +37,6 @@ known_cms = cms, menus
 known_django = django
 
 [testenv]
-deps =
-    -r{toxinidir}/tests/requirements/base.txt
-    dj22: Django>=2.2,<3.0
-    dj30: Django>=3.0,<3.1
-    dj31: Django>=3.1,<3.2
-    cms37: django-cms>=3.7,<3.8
-    cms38: django-cms>=3.8,<3.9
 commands =
     {envpython} --version
     {env:COMMAND:coverage} run setup.py test