Skip to content

Update django-import-export deps #6372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Update django-import-export deps #6372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pulpcore/app/importexport.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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("]"))

Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should tablib be a direct dependency at all?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We import it directly here:

pulpcore/pulpcore/app/tasks/importer.py

Line 16 in d563dec

from tablib import Dataset

However as long as django-import-export exists we can probably assume its presence? This requirement was primarily here to avoid new incompatible versions, and presumably that's less of an issue with these newer versions?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well turning it into a proper dependency with a proper range also sounds good then.

"url-normalize>=1.4.3,<=1.4.3",
"uuid6>=2023.5.2,<=2024.7.10",
"whitenoise>=5.0,<6.10.0",
Expand Down
Loading