From 8dfc0719ef3aca6662829f5b822c776194334237 Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Thu, 13 Jan 2022 13:08:41 +0100 Subject: [PATCH] TT#121955 replace django-export with django-import-export * it doesn't support Django 4.0 Change-Id: I696c3ac603a40d68f4d2fb439bb8957d442d877d --- repoapi/settings/common.py | 3 +-- repoapi/urls.py | 2 -- requirements/common.txt | 3 +-- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/repoapi/settings/common.py b/repoapi/settings/common.py index 990ca02..5486232 100644 --- a/repoapi/settings/common.py +++ b/repoapi/settings/common.py @@ -22,7 +22,6 @@ import structlog BASE_DIR = dirname(dirname(dirname(os.path.abspath(__file__)))) INSTALLED_APPS = [ - "object_tools", "django.contrib.admin", "django.contrib.auth", "django.contrib.contenttypes", @@ -37,7 +36,7 @@ INSTALLED_APPS = [ "django_extensions", "django_filters", "jsonify", - "export", + "import_export", "repoapi.apps.RepoAPIConfig", "hotfix.apps.HotfixConfig", "panel.apps.PanelConfig", diff --git a/repoapi/urls.py b/repoapi/urls.py index c31f2ac..5efe669 100644 --- a/repoapi/urls.py +++ b/repoapi/urls.py @@ -12,7 +12,6 @@ # # You should have received a copy of the GNU General Public License along # with this program. If not, see . -import object_tools from django.conf.urls import include from django.conf.urls import url from django.contrib import admin @@ -103,7 +102,6 @@ api_patterns = [ api_patterns = format_suffix_patterns(api_patterns) urlpatterns = [ - url(r"^object-tools/", object_tools.tools.urls), url(r"^admin/", admin.site.urls), url(r"^", include(api_patterns)), url( diff --git a/requirements/common.txt b/requirements/common.txt index dfdcf4e..51fe448 100644 --- a/requirements/common.txt +++ b/requirements/common.txt @@ -4,11 +4,10 @@ django-appconf django-assets django-celery-beat django-celery-results -django-export django-extensions django-filter +django-import-export django-jsonify -django-object-tools django-rest-swagger django-structlog django-timezone-field