django-import-export 4.3.0__tar.gz → 4.3.2__tar.gz

{django_import_export-4.3.0 → django_import_export-4.3.2}/.gitignore

@@ -9,6 +9,7 @@ dist/
 *.egg-info/
 .tox/
 .idea/
+.venv/
 *.python-version
 .coverage*
 *.sw[po]

{django_import_export-4.3.0 → django_import_export-4.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-import-export
-Version: 4.3.0
+Version: 4.3.2
 Summary: Django application and library for importing and exporting data with included admin integration.
 Author-email: Bojan Mihelač <djangoimportexport@gmail.com>
 Maintainer-email: Matthew Hegarty <djangoimportexport@gmail.com>
@@ -55,7 +55,7 @@ License-File: LICENSE
 License-File: AUTHORS
 Requires-Dist: diff-match-patch==20241021
 Requires-Dist: Django>=4.2
-Requires-Dist: tablib==3.7.0
+Requires-Dist: tablib>=3.7.0
 Provides-Extra: all
 Requires-Dist: tablib[all]; extra == "all"
 Provides-Extra: cli

{django_import_export-4.3.0 → django_import_export-4.3.2}/RELEASE.md

@@ -10,6 +10,17 @@ additional config to the CI process.
 
 Ensure that `CHANGELOG.rst` is up-to-date with the correct version number and release date.
 
+It's sensible to perform a clean installation of the package and ensure the server runs ok.
+This can avoid issues with broken imports which may not have been picked up by integration tests.
+
+```
+python -m venv venv
+pip install django-import-export
+tests/manage.py runserver
+```
+
+Now browse http://localhost:8000 and test that the site runs ok.
+
 ### Perform the release
 
 To create a new published release, follow the instructions [here](https://docs.github.com/en/repositories/releasing-projects-on-github/managing-releases-in-a-repository).

{django_import_export-4.3.0 → django_import_export-4.3.2}/django_import_export.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-import-export
-Version: 4.3.0
+Version: 4.3.2
 Summary: Django application and library for importing and exporting data with included admin integration.
 Author-email: Bojan Mihelač <djangoimportexport@gmail.com>
 Maintainer-email: Matthew Hegarty <djangoimportexport@gmail.com>
@@ -55,7 +55,7 @@ License-File: LICENSE
 License-File: AUTHORS
 Requires-Dist: diff-match-patch==20241021
 Requires-Dist: Django>=4.2
-Requires-Dist: tablib==3.7.0
+Requires-Dist: tablib>=3.7.0
 Provides-Extra: all
 Requires-Dist: tablib[all]; extra == "all"
 Provides-Extra: cli

{django_import_export-4.3.0 → django_import_export-4.3.2}/django_import_export.egg-info/requires.txt

@@ -1,6 +1,6 @@
 diff-match-patch==20241021
 Django>=4.2
-tablib==3.7.0
+tablib>=3.7.0
 
 [all]
 tablib[all]

{django_import_export-4.3.0 → django_import_export-4.3.2}/docs/advanced_usage.rst

@@ -369,7 +369,7 @@ You can optionally configure import-export to perform model instance validation
 :attr:`~import_export.options.ResourceOptions.clean_model_instances` attribute.
 
 You can override the
-`full_clean() <https://docs.djangoproject.com/en/stable/ref/models/instances/#django.db.models.Model.full_clean>`_.
+`full_clean() <https://docs.djangoproject.com/en/stable/ref/models/instances/#django.db.models.Model.full_clean>`_
 method to provide extra validation, either at field or instance level::
 
     class Book(models.Model):

{django_import_export-4.3.0 → django_import_export-4.3.2}/docs/changelog.rst

@@ -5,12 +5,23 @@ Changelog
 
     If upgrading from v3, v4 introduces breaking changes.  Please refer to :doc:`release notes<release_notes>`.
 
+4.3.2 (2024-12-01)
+------------------
+
+- Updated Farsi translation (`2008 <https://github.com/django-import-export/django-import-export/issues/2008>`_)
+- Updated German translation (`2012 <https://github.com/django-import-export/django-import-export/issues/2012>`_)
+
+4.3.1 (2024-11-19)
+------------------
+
+- Fix imports for openpyxl (`2005 <https://github.com/django-import-export/django-import-export/issues/2005>`_)
+
 4.3.0 (2024-11-19)
 ------------------
 
-- Addition of import & export management commands `(`1992 <https://github.com/django-import-export/django-import-export/issues/1992>`_)
-- Handle ``IllegalCharacterError`` in xlsx exports `(`2001 <https://github.com/django-import-export/django-import-export/issues/2001>`_)
-- Add ``__repr__`` method to InvalidRow for improved debugging `(`2003 <https://github.com/django-import-export/django-import-export/issues/2003>`_)
+- Addition of import & export management commands (`1992 <https://github.com/django-import-export/django-import-export/issues/1992>`_)
+- Handle ``IllegalCharacterError`` in xlsx exports (`2001 <https://github.com/django-import-export/django-import-export/issues/2001>`_)
+- Add ``__repr__`` method to InvalidRow for improved debugging (`2003 <https://github.com/django-import-export/django-import-export/issues/2003>`_)
 
 4.2.1 (2024-11-11)
 ------------------

{django_import_export-4.3.0 → django_import_export-4.3.2}/import_export/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '4.3.0'
-__version_tuple__ = version_tuple = (4, 3, 0)
+__version__ = version = '4.3.2'
+__version_tuple__ = version_tuple = (4, 3, 2)

{django_import_export-4.3.0 → django_import_export-4.3.2}/import_export/formats/base_formats.py

@@ -1,11 +1,13 @@
+# when adding imports, ensure that they are local to the
+# correct class for the file format.
+# e.g. add openpyxl imports to the XLSXFormat class
+# See issue 2004
 import logging
 import warnings
 
 import tablib
 from django.conf import settings
 from django.utils.translation import gettext_lazy as _
-from openpyxl.cell.cell import ILLEGAL_CHARACTERS_RE
-from openpyxl.utils.exceptions import IllegalCharacterError
 from tablib.formats import registry
 
 logger = logging.getLogger(__name__)
@@ -212,6 +214,8 @@ class XLSX(TablibFormat):
         return dataset
 
     def export_data(self, dataset, **kwargs):
+        from openpyxl.utils.exceptions import IllegalCharacterError
+
         # #1698 temporary catch for deprecation warning in openpyxl
         # this catch block must be removed when openpyxl updated
         with warnings.catch_warnings():
@@ -232,6 +236,8 @@ class XLSX(TablibFormat):
                 raise ValueError(_("export failed due to IllegalCharacterError"))
 
     def _escape_illegal_chars(self, dataset):
+        from openpyxl.cell.cell import ILLEGAL_CHARACTERS_RE
+
         def _do_escape(cell):
             if type(cell) is str:
                 cell = ILLEGAL_CHARACTERS_RE.sub("\N{REPLACEMENT CHARACTER}", cell)

{django_import_export-4.3.0 → django_import_export-4.3.2}/import_export/locale/de/LC_MESSAGES/django.po

@@ -1,13 +1,11 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# David Glenck <github@ihdg.ch>, 2024.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-03-15 13:54+0000\n"
+"POT-Creation-Date: 2024-12-01 13:15+0100\n"
 "PO-Revision-Date: 2022-10-17 17:42+0200\n"
 "Last-Translator: Jannes Blobel <jannes.blobel@inlang.com>\n"
 "Language-Team: \n"
@@ -18,42 +16,55 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 3.1.1\n"
 
-#: admin.py:246 admin.py:588
+#: admin.py:184 admin.py:548
+#: templates/admin/import_export/change_list_import_item.html:5
+#: templates/admin/import_export/import.html:19
+msgid "Import"
+msgstr "Importieren"
+
+#: admin.py:254 admin.py:600
 #, python-format
 msgid "%s through import_export"
 msgstr "%s durch import_export"
 
-#: admin.py:254
-#, fuzzy
-#| msgid "Import finished, with {} new and {} updated {}."
+#: admin.py:262
 msgid "Import finished: {} new, {} updated, {} deleted and {} skipped {}."
-msgstr "Import fertiggestellt, mit {} neuen und {} aktualisierten {}."
+msgstr ""
+"Import fertiggestellt: {} neue, {} aktualisierte, {} gelöschte und {} "
+"übersprungene {}."
 
-#: admin.py:423
+#: admin.py:431
 #, python-format
 msgid ""
 "%(exc_name)s encountered while trying to read file. Ensure you have chosen "
 "the correct format for the file."
 msgstr ""
-"%(exc_name)s beim Versuch, die Datei zu lesen ist aufgetretten. Stellen Sie "
-"sicher, dass du  das richtige Format für deine Datei gewählt hast"
+"%(exc_name)s trat auf, beim Versuch, die Datei zu lesen. Stelle sicher, dass "
+"du das richtige Format für die Datei gewählt hast."
 
-#: admin.py:539 templates/admin/import_export/change_list_import_item.html:5
-#: templates/admin/import_export/import.html:19
-msgid "Import"
-msgstr "Importieren"
+#: admin.py:504
+msgid ""
+"No valid data to import. Ensure your file has the correct headers or data "
+"for import."
+msgstr ""
+"Keine gültigen Daten für den Import. Stelle sicher, dass deine Datei die "
+"korrektenKopfzeilen und Daten für den Import hat."
 
-#: admin.py:785 templates/admin/import_export/change_form.html:8
+#: admin.py:819 templates/admin/import_export/change_form.html:8
 #: templates/admin/import_export/change_list_export_item.html:5
 #: templates/admin/import_export/export.html:12
 msgid "Export"
 msgstr "Exportieren"
 
-#: admin.py:911
+#: admin.py:952
 #, python-format
 msgid "Export selected %(verbose_name_plural)s"
 msgstr "Ausgewählte %(verbose_name_plural)s exportieren"
 
+#: formats/base_formats.py:236
+msgid "export failed due to IllegalCharacterError"
+msgstr "Export schlug fehl wegen IllegalCharacterError"
+
 #: forms.py:15
 msgid "Resource"
 msgstr "Ressource"
@@ -62,43 +73,47 @@ msgstr "Ressource"
 msgid "Format"
 msgstr "Dateiformat"
 
-#: forms.py:58
+#: forms.py:56
 msgid "File to import"
 msgstr "Zu importierende Datei"
 
-#: forms.py:209
+#: forms.py:216
 msgid "Form is not validated, call `is_valid` first"
-msgstr ""
+msgstr "Formular ist nicht validiert, führe zuerst `is_valid` aus"
 
-#: forms.py:261
+#: forms.py:268
 #, python-format
 msgid "Select at least 1 field for \"%(resource_name)s\" to export"
-msgstr ""
+msgstr "Wähle mindestens 1 Feld für \"%(resource_name)s\" zum Exportieren aus"
 
-#: resources.py:1137
+#: resources.py:1171
 #, python-format
 msgid ""
 "The following fields are declared in 'import_id_fields' but are not present "
 "in the resource fields: %s"
 msgstr ""
+"Die folgenden Felder sind in 'import_id_fields' deklariert, sind aber keine "
+"Felder der Ressource: %s"
 
-#: resources.py:1152
+#: resources.py:1186
 #, python-format
 msgid ""
 "The following fields are declared in 'import_id_fields' but are not present "
 "in the file headers: %s"
 msgstr ""
+"Die folgenden Felder sind in 'import_id_fields' deklariert, aber nicht in "
+"der Kopfzeile der Datei vorhanden: %s"
 
-#: results.py:120
+#: results.py:150
 #, python-format
 msgid "call to force_str() on instance failed: %s"
-msgstr ""
+msgstr "Aufruf von force_str() in der Instanz schlug fehl: %s"
 
 #: templates/admin/import_export/base.html:11
 msgid "Home"
 msgstr "Start"
 
-#: templates/admin/import_export/export.html:21
+#: templates/admin/import_export/export.html:24
 #, python-format
 msgid ""
 "\n"
@@ -109,17 +124,21 @@ msgid_plural ""
 "        Export %(len)s selected items.\n"
 "      "
 msgstr[0] ""
+"\n"
+"        Exportiere %(len)s ausgewähltes Element.\n"
+"      "
 msgstr[1] ""
+"\n"
+"        Exportiere %(len)s ausgewählte Elemente.\n"
+"      "
 
-#: templates/admin/import_export/export.html:48
+#: templates/admin/import_export/export.html:51
 #: templates/admin/import_export/resource_fields_list.html:5
-#, fuzzy
-#| msgid "This importer will import the following fields: "
 msgid "This exporter will export the following fields: "
-msgstr "Es werden die folgenden Felder importiert: "
+msgstr "Es werden die folgenden Felder exportiert: "
 
-#: templates/admin/import_export/export.html:76
-#: templates/admin/import_export/import.html:69
+#: templates/admin/import_export/export.html:85
+#: templates/admin/import_export/import.html:73
 msgid "Submit"
 msgstr "Absenden"
 
@@ -135,20 +154,20 @@ msgstr ""
 msgid "Confirm import"
 msgstr "Import bestätigen"
 
-#: templates/admin/import_export/import.html:80
-#: templates/admin/import_export/import.html:121
+#: templates/admin/import_export/import.html:84
+#: templates/admin/import_export/import.html:125
 msgid "Errors"
 msgstr "Fehler"
 
-#: templates/admin/import_export/import.html:94
+#: templates/admin/import_export/import.html:98
 msgid "Line number"
 msgstr "Zeilennummer"
 
-#: templates/admin/import_export/import.html:113
+#: templates/admin/import_export/import.html:117
 msgid "Some rows failed to validate"
 msgstr "Die Validierung einiger Zeilen schlug fehl"
 
-#: templates/admin/import_export/import.html:115
+#: templates/admin/import_export/import.html:119
 msgid ""
 "Please correct these errors in your data where possible, then reupload it "
 "using the form above."
@@ -156,53 +175,42 @@ msgstr ""
 "Bitte korrigiere falls möglich diese Fehler in deiner Datei und lade sie "
 "anschließend erneut mit dem obigen Formular hoch."
 
-#: templates/admin/import_export/import.html:120
+#: templates/admin/import_export/import.html:124
 msgid "Row"
 msgstr "Zeile"
 
-#: templates/admin/import_export/import.html:147
+#: templates/admin/import_export/import.html:151
 msgid "Non field specific"
 msgstr "Nicht feldspezifisch"
 
-#: templates/admin/import_export/import.html:170
+#: templates/admin/import_export/import.html:174
 msgid "Preview"
 msgstr "Vorschau"
 
-#: templates/admin/import_export/import.html:185
+#: templates/admin/import_export/import.html:189
 msgid "New"
 msgstr "Neu"
 
-#: templates/admin/import_export/import.html:187
+#: templates/admin/import_export/import.html:191
 msgid "Skipped"
 msgstr "Übersprungen"
 
-#: templates/admin/import_export/import.html:189
+#: templates/admin/import_export/import.html:193
 msgid "Delete"
 msgstr "Löschen"
 
-#: templates/admin/import_export/import.html:191
+#: templates/admin/import_export/import.html:195
 msgid "Update"
-msgstr "Update"
+msgstr "Ändern"
 
 #: templates/admin/import_export/resource_fields_list.html:7
 msgid "This importer will import the following fields: "
 msgstr "Es werden die folgenden Felder importiert: "
 
-#: widgets.py:250
-msgid "Value could not be parsed using defined date formats."
-msgstr ""
-
-#: widgets.py:300
-msgid "Value could not be parsed using defined datetime formats."
-msgstr ""
-
-#: widgets.py:346
-msgid "Value could not be parsed using defined time formats."
-msgstr ""
-
-#: widgets.py:374
+#: widgets.py:369
 msgid "Value could not be parsed."
-msgstr ""
+msgstr "Wert konnte nicht eingelesen werden."
 
-#~ msgid "You must select an export format."
-#~ msgstr "Es muss ein Exportformat ausgewählt werden."
+#: widgets.py:497
+msgid "use_natural_foreign_keys and key_is_id cannot both be True"
+msgstr "use_natural_foreign_keys und key_is_id können nicht beide True sein"

{django_import_export-4.3.0 → django_import_export-4.3.2}/import_export/locale/fa/LC_MESSAGES/django.po

@@ -2,13 +2,14 @@
 # This file is distributed under the same license as the django-import-export package.
 #
 # Yazdan Ranjbar <Yazdan_ra@icloud.com>, 2021.
+# MohammadReza Sadegh Zadeh <org.m.sdz@gmail.com>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-03-15 13:54+0000\n"
 "PO-Revision-Date: 2021-03-09 00:29+0030\n"
-"Last-Translator: Yazdan Ranjbar <Yazdan_ra@icloud.com>\n"
+"Last-Translator: MohammadReza Sadegh Zadeh <org.m.sdz@gmail.com>\n"
 "Language-Team: Persain/Farsi <kde-i18n-it@kde.org>\n"
 "Language: Farsi/Persian\n"
 "MIME-Version: 0.1\n"
@@ -20,20 +21,20 @@ msgstr ""
 #: admin.py:246 admin.py:588
 #, python-format
 msgid "%s through import_export"
-msgstr "%s یه وسیله ورودی-خروجی"
+msgstr "%s با استفاده از ورودی-خروجی"
 
 #: admin.py:254
 #, fuzzy
 #| msgid "Import finished, with {} new and {} updated {}."
 msgid "Import finished: {} new, {} updated, {} deleted and {} skipped {}."
-msgstr "بارگذاری تمام شد، با {} مورد جدید و {} مورد به روز شده."
+msgstr "بارگذاری تمام شد، با {} مورد جدید، {} مورد به روز شده، {} مورد حذف شده و {} مورد در شده."
 
 #: admin.py:423
 #, python-format
 msgid ""
 "%(exc_name)s encountered while trying to read file. Ensure you have chosen "
 "the correct format for the file."
-msgstr ""
+msgstr "در حال خواندن فایل، یک خطا رخ داده است. لطفا از فرمت مناسب برای فایل استفاده کنید. %(exc_name)s"
 
 #: admin.py:539 templates/admin/import_export/change_list_import_item.html:5
 #: templates/admin/import_export/import.html:19
@@ -53,7 +54,7 @@ msgstr "خروجی %(verbose_name_plural)s انتخاب شده"
 
 #: forms.py:15
 msgid "Resource"
-msgstr ""
+msgstr "منبع"
 
 #: forms.py:20
 msgid "Format"
@@ -61,35 +62,35 @@ msgstr "فرمت"
 
 #: forms.py:58
 msgid "File to import"
-msgstr "قایل برای بارگذاری"
+msgstr "فایل برای بارگذاری"
 
 #: forms.py:209
 msgid "Form is not validated, call `is_valid` first"
-msgstr ""
+msgstr "فرم معتبر نیست، ابتدا `is_valid` را فراخوانی کنید"
 
 #: forms.py:261
 #, python-format
 msgid "Select at least 1 field for \"%(resource_name)s\" to export"
-msgstr ""
+msgstr "حداقل یک فیلد را برای \"%(resource_name)s\" برای خروجی انتخاب کنید"
 
 #: resources.py:1137
 #, python-format
 msgid ""
 "The following fields are declared in 'import_id_fields' but are not present "
 "in the resource fields: %s"
-msgstr ""
+msgstr "فیلد‌های زیر در 'import_id_fields' اعلام شده اند، اما در فیلد‌های منبع وجود ندارند: %s"
 
 #: resources.py:1152
 #, python-format
 msgid ""
 "The following fields are declared in 'import_id_fields' but are not present "
 "in the file headers: %s"
-msgstr ""
+msgstr "فیلد‌های زیر در 'import_id_fields' اعلام شده اند، اما در فیلد‌های منبع وجود ندارند: %s"
 
 #: results.py:120
 #, python-format
 msgid "call to force_str() on instance failed: %s"
-msgstr ""
+msgstr "فراخوانی به `force_str()` بر روی مورد نمونه با خطا رخ داده است: %s"
 
 #: templates/admin/import_export/base.html:11
 msgid "Home"
@@ -106,14 +107,20 @@ msgid_plural ""
 "        Export %(len)s selected items.\n"
 "      "
 msgstr[0] ""
+"\n"
+"        خروجی %(len)s مورد انتخاب شده.\n"
+"        "
 msgstr[1] ""
+"\n"
+"        خروجی %(len)s مورد انتخاب شده.\n"
+"        "
 
 #: templates/admin/import_export/export.html:48
 #: templates/admin/import_export/resource_fields_list.html:5
 #, fuzzy
 #| msgid "This importer will import the following fields: "
 msgid "This exporter will export the following fields: "
-msgstr "این بارگذاری شامل این فیلد‌ها هست:"
+msgstr "این خروجی شامل این فیلد‌ها هست:"
 
 #: templates/admin/import_export/export.html:76
 #: templates/admin/import_export/import.html:69
@@ -124,9 +131,7 @@ msgstr "ارسال"
 msgid ""
 "Below is a preview of data to be imported. If you are satisfied with the "
 "results, click 'Confirm import'"
-msgstr ""
-"پایین یک پیش‌نمایش از دیتا‌هایی است که بارگذاری خواهند شد اگر این موارد درست "
-"هستروی 'تایید بارگذاری' گلیگ گنید"
+msgstr "پایین یک پیش‌نمایش از دیتا‌هایی است که بارگذاری خواهند شد اگر این موارد درست هستند، روی 'تایید بارگذاری' کلیک کنید"
 
 #: templates/admin/import_export/import.html:33
 msgid "Confirm import"
@@ -143,7 +148,7 @@ msgstr "شماره خط"
 
 #: templates/admin/import_export/import.html:113
 msgid "Some rows failed to validate"
-msgstr "برخی از سطر‌ها معتبر نبودند"
+msgstr "برخی سطر‌ها معتبر نبودند"
 
 #: templates/admin/import_export/import.html:115
 msgid ""
@@ -153,7 +158,7 @@ msgstr "لطفا این خطا را تصحیح کنید و سپس مجدد فا
 
 #: templates/admin/import_export/import.html:120
 msgid "Row"
-msgstr "سظر"
+msgstr "سطر"
 
 #: templates/admin/import_export/import.html:147
 msgid "Non field specific"
@@ -161,7 +166,7 @@ msgstr "فیلد‌های غیر اختصاصی"
 
 #: templates/admin/import_export/import.html:170
 msgid "Preview"
-msgstr "نمایش"
+msgstr "پیش‌نمایش"
 
 #: templates/admin/import_export/import.html:185
 msgid "New"
@@ -169,7 +174,7 @@ msgstr "جدید"
 
 #: templates/admin/import_export/import.html:187
 msgid "Skipped"
-msgstr "در شد"
+msgstr "رد شده"
 
 #: templates/admin/import_export/import.html:189
 msgid "Delete"
@@ -185,19 +190,19 @@ msgstr "این بارگذاری شامل این فیلد‌ها هست:"
 
 #: widgets.py:250
 msgid "Value could not be parsed using defined date formats."
-msgstr ""
+msgstr "مقدار قابل تجزیه نبود با فرمت‌های تاریخ تعریف شده."
 
 #: widgets.py:300
 msgid "Value could not be parsed using defined datetime formats."
-msgstr ""
+msgstr "مقدار قابل تجزیه نبود با فرمت‌های تاریخ و زمان تعریف شده."
 
 #: widgets.py:346
 msgid "Value could not be parsed using defined time formats."
-msgstr ""
+msgstr "مقدار قابل تجزیه نبود با فرمت‌های زمان تعریف شده."
 
 #: widgets.py:374
 msgid "Value could not be parsed."
-msgstr ""
+msgstr "مقدار قابل تجزیه نبود."
 
-#~ msgid "You must select an export format."
-#~ msgstr "شما باید یک فرمت خروجی انتخاب کنید"
+msgid "You must select an export format."
+msgstr "شما باید یک فرمت خروجی انتخاب کنید"

{django_import_export-4.3.0 → django_import_export-4.3.2}/pyproject.toml

@@ -38,7 +38,7 @@ classifiers = [
 dependencies = [
     "diff-match-patch==20241021",
     "Django>=4.2",
-    "tablib==3.7.0"
+    "tablib>=3.7.0"
 ]
 
 [project.optional-dependencies]

{django_import_export-4.3.0 → django_import_export-4.3.2}/tests/core/tests/test_command_import.py

@@ -3,14 +3,13 @@ from io import BytesIO, StringIO, TextIOWrapper
 from unittest import mock
 from unittest.mock import patch
 
-from build.lib.import_export.resources import ModelResource
 from core.models import Book
 from django.core.management import call_command
 from django.core.management.base import CommandError
 from django.test import TestCase
 
 from import_export.formats.base_formats import XLSX
-from import_export.resources import modelresource_factory
+from import_export.resources import ModelResource, modelresource_factory
 
 CSV_CONTENT = """\
 id,name,author,author_email,imported,published,published_time,price,added,categories

{django_import_export-4.3.0 → django_import_export-4.3.2}/tests/core/tests/test_model_resource_fields_generate_widgets.py

@@ -119,6 +119,8 @@ class TestFieldWidgetMapping(TestCase):
             expected_not_presented_fields |= {models.GeneratedField}
         if django.VERSION >= (5, 1):
             expected_not_presented_fields |= {contenttype_fields.GenericForeignKey}
+        if django.VERSION >= (5, 2):
+            expected_not_presented_fields |= {models.CompositePrimaryKey}
         return expected_not_presented_fields
 
     def _get_all_django_model_field_subclasses(self):