From ce339e488975b122f542eecdeca6864c990eb5ae Mon Sep 17 00:00:00 2001 From: Daniel Alley Date: Wed, 19 Mar 2025 09:11:00 -0400 Subject: [PATCH] Update django-import-export deps These have gotten very out of date and it seems like dependabot hasn't worked on them. --- pulpcore/app/importexport.py | 2 +- pyproject.toml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pulpcore/app/importexport.py b/pulpcore/app/importexport.py index c8ade37077..64076ef407 100644 --- a/pulpcore/app/importexport.py +++ b/pulpcore/app/importexport.py @@ -53,7 +53,7 @@ def _write_export(the_tarfile, resource, dest_dir=None): def process_batch(batch): model = resource.queryset.model queryset = model.objects.filter(pk__in=batch) - dataset = resource.export(queryset) + dataset = resource.export(queryset=queryset) # Strip "[" and "]" as we are writing the dataset in batch temp_file.write(dataset.json.lstrip("[").rstrip("]")) diff --git a/pyproject.toml b/pyproject.toml index 051fd7273b..a19cd2d50e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -38,7 +38,7 @@ dependencies = [ "Django~=4.2.0", # LTS version, switch only if we have a compelling reason to", "django-filter>=23.1,<=25.1", "django-guid>=3.3,<=3.5.1", - "django-import-export>=2.9,<3.4.0", + "django-import-export>=4.3,<5.0", "django-lifecycle>=1.0,<=1.2.4", "djangorestframework>=3.14.0,<=3.15.2", "djangorestframework-queryfields>=1.0,<=1.1.0", @@ -63,7 +63,7 @@ dependencies = [ "python-gnupg>=0.5,<=0.5.4", "PyYAML>=5.1.1,<=6.0.2", "redis>=4.3,<5.2.2", - "tablib<3.6.0", + "tablib>=3.7.0,<3.9.0", "url-normalize>=1.4.3,<=1.4.3", "uuid6>=2023.5.2,<=2024.7.10", "whitenoise>=5.0,<6.10.0",