From 0abe036c106b7510e3d17b5ab66e8fddeb1a054d Mon Sep 17 00:00:00 2001 From: matthewhegarty Date: Thu, 21 Nov 2024 11:38:55 +0000 Subject: [PATCH 1/6] updated settings --- test_project/settings.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test_project/settings.py b/test_project/settings.py index 0cc54af..b4c2f4e 100644 --- a/test_project/settings.py +++ b/test_project/settings.py @@ -76,7 +76,7 @@ "USER": "django-import-export-extensions-user", "NAME": "django-import-export-extensions-dev", "PASSWORD": "testpass", - "HOST": "postgres", + "HOST": "localhost", "PORT": 5432, }, } @@ -124,8 +124,8 @@ CELERY_ACCEPT_CONTENT = ["pickle", "json"] CELERY_TASK_ROUTES = {} -CELERY_BROKER = "redis://redis/1" -CELERY_BACKEND = "redis://redis/1" +CELERY_BROKER = "redis://localhost/1" +CELERY_BACKEND = "redis://localhost/1" CELERY_TASK_DEFAULT_QUEUE = "development" DEFAULT_AUTO_FIELD = "django.db.models.AutoField" From 7203569493314d325c5711ac7172485f08d1a84e Mon Sep 17 00:00:00 2001 From: matthewhegarty Date: Thu, 21 Nov 2024 12:07:39 +0000 Subject: [PATCH 2/6] minor documentation updates --- AUTHORS.rst | 1 + docs/migrate_from_original_import_export.rst | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/AUTHORS.rst b/AUTHORS.rst index 948c493..ed2c5a4 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -15,3 +15,4 @@ Contributors * NikAzanov (Nikita Azanov) * ron8mcr (Roman Gorbil) * Eg0ra (Egor Toryshak) +* matthewhegarty (Matthew Hegarty) diff --git a/docs/migrate_from_original_import_export.rst b/docs/migrate_from_original_import_export.rst index f9c664c..36cf3e7 100644 --- a/docs/migrate_from_original_import_export.rst +++ b/docs/migrate_from_original_import_export.rst @@ -4,7 +4,7 @@ Migrate from original `django-import-export` package If you're already using ``django-import-export`` and want to take advantage of ``django-import-export-extensions`` for background import/export, the transition is simple. First, -install the package following the provided :ref:`the instruction`. +install the package by following the :ref:`the installation guide`. Then, all you need to do is update the base classes for your resource and admin models. Migrate resources @@ -109,3 +109,9 @@ number of rows and the number of rows that have been completed. 'EXPORTED' >>> export_job.data_file.path '../media/import_export_extensions/export/3dfb7510-5593-4dc6-9d7d-bbd907cd3eb6/Artists-2020-02-22.csv' + +Other configuration +------------------- + +You may need to configure `MEDIA_URL `_ in your +project settings, otherwise you may see a 404 error when attempting to download exported files. From ffecd9acd21239b80eb69835ab767d995d22f641 Mon Sep 17 00:00:00 2001 From: matthewhegarty Date: Thu, 21 Nov 2024 12:26:20 +0000 Subject: [PATCH 3/6] minor copy changes --- .../admin/import_export_extensions/celery_import_results.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/import_export_extensions/templates/admin/import_export_extensions/celery_import_results.html b/import_export_extensions/templates/admin/import_export_extensions/celery_import_results.html index b68240f..3dd363a 100644 --- a/import_export_extensions/templates/admin/import_export_extensions/celery_import_results.html +++ b/import_export_extensions/templates/admin/import_export_extensions/celery_import_results.html @@ -157,9 +157,9 @@

{% trans "Some rows failed to validate" %}

{% if import_job.import_status in import_job.success_statuses %}

{% if import_job.import_status == "PARSED" %} - {% trans "These elements will be imported successfully" %} + {% trans "These elements will be imported" %} {% elif import_job.import_status == "IMPORTED"%} - {% trans "These elements are imported successfully" %} + {% trans "These elements were imported successfully" %} {% endif %}

From 440c8d610d18fbeff06757901fa24013e4241f0f Mon Sep 17 00:00:00 2001 From: matthewhegarty Date: Thu, 21 Nov 2024 13:44:31 +0000 Subject: [PATCH 4/6] updated config --- .env | 1 + test_project/settings.py | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.env b/.env index b445d99..3843f52 100644 --- a/.env +++ b/.env @@ -1,3 +1,4 @@ # this docker-compose environment file # https://docs.docker.com/compose/env-file/#environment-file COMPOSE_PROJECT_NAME=django-import-export-extensions +HOST=localhost diff --git a/test_project/settings.py b/test_project/settings.py index b4c2f4e..b08c28c 100644 --- a/test_project/settings.py +++ b/test_project/settings.py @@ -1,3 +1,4 @@ +import os import pathlib # Build paths inside the project like this: BASE_DIR / "subdir" @@ -68,6 +69,7 @@ # Database # https://docs.djangoproject.com/en/1.9/ref/settings/#databases +HOST = os.environ.get("HOST", "postgres") DATABASES = { "default": { "ENGINE": "django.db.backends.postgresql", @@ -76,7 +78,7 @@ "USER": "django-import-export-extensions-user", "NAME": "django-import-export-extensions-dev", "PASSWORD": "testpass", - "HOST": "localhost", + "HOST": HOST, "PORT": 5432, }, } @@ -124,8 +126,8 @@ CELERY_ACCEPT_CONTENT = ["pickle", "json"] CELERY_TASK_ROUTES = {} -CELERY_BROKER = "redis://localhost/1" -CELERY_BACKEND = "redis://localhost/1" +CELERY_BROKER = f"redis://{HOST}/1" +CELERY_BACKEND = f"redis://{HOST}/1" CELERY_TASK_DEFAULT_QUEUE = "development" DEFAULT_AUTO_FIELD = "django.db.models.AutoField" From 0d4c79c1dcd85717c9a494abc3e69a173633d04e Mon Sep 17 00:00:00 2001 From: matthewhegarty Date: Thu, 21 Nov 2024 13:51:08 +0000 Subject: [PATCH 5/6] updated env vars --- .env | 3 ++- test_project/settings.py | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.env b/.env index 3843f52..33bc22e 100644 --- a/.env +++ b/.env @@ -1,4 +1,5 @@ # this docker-compose environment file # https://docs.docker.com/compose/env-file/#environment-file COMPOSE_PROJECT_NAME=django-import-export-extensions -HOST=localhost +DB_HOST=localhost +REDIS_HOST=localhost diff --git a/test_project/settings.py b/test_project/settings.py index b08c28c..3be3b14 100644 --- a/test_project/settings.py +++ b/test_project/settings.py @@ -69,7 +69,7 @@ # Database # https://docs.djangoproject.com/en/1.9/ref/settings/#databases -HOST = os.environ.get("HOST", "postgres") +DB_HOST = os.environ.get("DB_HOST", "postgres") DATABASES = { "default": { "ENGINE": "django.db.backends.postgresql", @@ -78,7 +78,7 @@ "USER": "django-import-export-extensions-user", "NAME": "django-import-export-extensions-dev", "PASSWORD": "testpass", - "HOST": HOST, + "HOST": DB_HOST, "PORT": 5432, }, } @@ -125,9 +125,10 @@ CELERY_TASK_SERIALIZER = "pickle" CELERY_ACCEPT_CONTENT = ["pickle", "json"] +REDIS_HOST = os.environ.get("REDIS_HOST", "redis") CELERY_TASK_ROUTES = {} -CELERY_BROKER = f"redis://{HOST}/1" -CELERY_BACKEND = f"redis://{HOST}/1" +CELERY_BROKER = f"redis://{REDIS_HOST}/1" +CELERY_BACKEND = f"redis://{REDIS_HOST}/1" CELERY_TASK_DEFAULT_QUEUE = "development" DEFAULT_AUTO_FIELD = "django.db.models.AutoField" From 3254cfaa90c7e5ef30f12c9831c0f76405542872 Mon Sep 17 00:00:00 2001 From: matthewhegarty Date: Thu, 19 Dec 2024 11:32:11 +0000 Subject: [PATCH 6/6] reverted local changes --- .env | 2 -- AUTHORS.rst | 1 - test_project/settings.py | 9 +++------ 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/.env b/.env index 33bc22e..b445d99 100644 --- a/.env +++ b/.env @@ -1,5 +1,3 @@ # this docker-compose environment file # https://docs.docker.com/compose/env-file/#environment-file COMPOSE_PROJECT_NAME=django-import-export-extensions -DB_HOST=localhost -REDIS_HOST=localhost diff --git a/AUTHORS.rst b/AUTHORS.rst index ed2c5a4..948c493 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -15,4 +15,3 @@ Contributors * NikAzanov (Nikita Azanov) * ron8mcr (Roman Gorbil) * Eg0ra (Egor Toryshak) -* matthewhegarty (Matthew Hegarty) diff --git a/test_project/settings.py b/test_project/settings.py index 1b6542d..9a0325a 100644 --- a/test_project/settings.py +++ b/test_project/settings.py @@ -1,4 +1,3 @@ -import os import pathlib # Build paths inside the project like this: BASE_DIR / "subdir" @@ -69,7 +68,6 @@ # Database # https://docs.djangoproject.com/en/1.9/ref/settings/#databases -DB_HOST = os.environ.get("DB_HOST", "postgres") DATABASES = { "default": { "ENGINE": "django.db.backends.postgresql", @@ -78,7 +76,7 @@ "USER": "django-import-export-extensions-user", "NAME": "django-import-export-extensions-dev", "PASSWORD": "testpass", - "HOST": DB_HOST, + "HOST": "postgres", "PORT": 5432, }, } @@ -125,10 +123,9 @@ CELERY_TASK_SERIALIZER = "pickle" CELERY_ACCEPT_CONTENT = ["pickle", "json"] -REDIS_HOST = os.environ.get("REDIS_HOST", "redis") CELERY_TASK_ROUTES = {} -CELERY_BROKER = f"redis://{REDIS_HOST}/1" -CELERY_BACKEND = f"redis://{REDIS_HOST}/1" +CELERY_BROKER = "redis://redis/1" +CELERY_BACKEND = "redis://redis/1" CELERY_TASK_DEFAULT_QUEUE = "development" DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"