Merge branch 'main' into doc-updates

saritasa-nest · Dec 19, 2024 · 37c0d5e · 37c0d5e
2 parents f43ef3f + 5a237c6
commit 37c0d5e
Show file tree

Hide file tree

Showing 9 changed files with 302 additions and 224 deletions.
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -1,7 +1,8 @@
 =======
 History
 =======
-UNRELEASED
+
+1.1.0 (2024-12-06)
 ------------------
 * Fix progress bar on changeview for ImportJob and ExportJob
 * Improve celery-import-result page
@@ -13,6 +14,7 @@ UNRELEASED
 
 * Fixed display of progress bar when task is waiting to run (https://github.com/saritasa-nest/django-import-export-extensions/issues/68)
 * Improve progress bar style (https://github.com/saritasa-nest/django-import-export-extensions/issues/72)
+* Set `default_auto_field` for `import-export-extensions` app to `django.db.models.BigAutoField` (https://github.com/saritasa-nest/django-import-export-extensions/issues/69)
 
 1.0.1 (2024-11-08)
 ------------------

diff --git a/README.md b/README.md
@@ -90,7 +90,7 @@ from .. import resources
 
 @admin.register(models.Book)
 class BookAdmin(CeleryImportExportMixin, admin.ModelAdmin):
-    resource_class = resources.BookResource
+    resource_classes = [resources.BookResource]
 ```
 
 Prepare view sets to import/export via API

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
@@ -109,7 +109,7 @@ Admin models
 ------------
 
 To perform import/export operations using Celery through Django Admin,
-use the ``CeleryImportExportMixin`` in your admin model and set the ``resource_class`` class attribute.
+use the ``CeleryImportExportMixin`` in your admin model and set the ``resource_classes`` class attribute.
 
 .. code-block:: python
 

diff --git a/import_export_extensions/apps.py b/import_export_extensions/apps.py
@@ -14,6 +14,7 @@ class CeleryImportExport(AppConfig):
 
     name = "import_export_extensions"
     verbose_name = _("Celery Import/Export")
+    default_auto_field = "django.db.models.BigAutoField"
 
     def ready(self):
         """Set up default settings."""

diff --git a/import_export_extensions/migrations/0008_alter_exportjob_id_alter_importjob_id.py b/import_export_extensions/migrations/0008_alter_exportjob_id_alter_importjob_id.py
@@ -0,0 +1,35 @@
+# Generated by Django 5.1.3 on 2024-12-05 07:16
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        (
+            "import_export_extensions",
+            "0007_alter_exportjob_result_alter_importjob_result",
+        ),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="exportjob",
+            name="id",
+            field=models.BigAutoField(
+                auto_created=True,
+                primary_key=True,
+                serialize=False,
+                verbose_name="ID",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="importjob",
+            name="id",
+            field=models.BigAutoField(
+                auto_created=True,
+                primary_key=True,
+                serialize=False,
+                verbose_name="ID",
+            ),
+        ),
+    ]
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "django-import-export-extensions"
-version = "1.0.1"
+version = "1.1.0"
 description = "Extend functionality of `django-import-export`"
 license = "MIT"
 authors = ["Saritasa <[email protected]>"]
@@ -51,7 +51,7 @@ django-import-export = { extras = ["xls", "xlsx"], version = ">=4.2" }
 djangorestframework = "^3.15.2"
 # OpenApi auto specs generator
 # https://drf-spectacular.readthedocs.io/en/latest/
-drf-spectacular = "^0.27.1"
+drf-spectacular = ">=0.27.1,<0.29.0"
 # Filter querysets dynamically
 # https://django-filter.readthedocs.io/en/stable/
 django-filter = "^24.3"

diff --git a/test_project/fake_app/migrations/0001_initial.py b/test_project/fake_app/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 5.1.1 on 2024-10-14 08:56
+# Generated by Django 5.1.3 on 2024-12-05 07:52
 
 import django.db.models.deletion
 from django.db import migrations, models
@@ -15,7 +15,7 @@ class Migration(migrations.Migration):
             fields=[
                 (
                     "id",
-                    models.AutoField(
+                    models.BigAutoField(
                         auto_created=True,
                         primary_key=True,
                         serialize=False,
@@ -34,7 +34,7 @@ class Migration(migrations.Migration):
             fields=[
                 (
                     "id",
-                    models.AutoField(
+                    models.BigAutoField(
                         auto_created=True,
                         primary_key=True,
                         serialize=False,
@@ -53,7 +53,7 @@ class Migration(migrations.Migration):
             fields=[
                 (
                     "id",
-                    models.AutoField(
+                    models.BigAutoField(
                         auto_created=True,
                         primary_key=True,
                         serialize=False,
@@ -89,7 +89,7 @@ class Migration(migrations.Migration):
             fields=[
                 (
                     "id",
-                    models.AutoField(
+                    models.BigAutoField(
                         auto_created=True,
                         primary_key=True,
                         serialize=False,

diff --git a/test_project/settings.py b/test_project/settings.py
@@ -131,7 +131,7 @@
 CELERY_BACKEND = f"redis://{REDIS_HOST}/1"
 CELERY_TASK_DEFAULT_QUEUE = "development"
 
-DEFAULT_AUTO_FIELD = "django.db.models.AutoField"
+DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
 
 if DEBUG:
     INSTALLED_APPS += ("debug_toolbar",)