From 107a3313ff6aacae336e86e0f0ee65c128dfa779 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Bedna=C5=99=C3=ADk?= <jan.bednarik@gmail.com>
Date: Wed, 1 Feb 2023 16:36:48 +0100
Subject: [PATCH] Remove Wagtail Transfer
---
.isort.cfg | 2 +-
Dockerfile | 1 -
README.md | 2 --
majak/settings/base.py | 11 -----------
majak/settings/dev.py | 3 ---
majak/settings/production.py | 1 -
majak/urls.py | 2 --
requirements/base.in | 1 -
requirements/base.txt | 2 --
9 files changed, 1 insertion(+), 24 deletions(-)
diff --git a/.isort.cfg b/.isort.cfg
index e5972edc..2f6cd78c 100644
--- a/.isort.cfg
+++ b/.isort.cfg
@@ -3,4 +3,4 @@
line_length = 88
multi_line_output = 3
include_trailing_comma = true
-known_third_party = PyPDF2,arrow,bleach,bs4,captcha,celery,dateutil,django,environ,faker,fastjsonschema,icalevnt,markdown,modelcluster,pirates,pytest,pytz,requests,sentry_sdk,taggit,tweepy,wagtail,wagtail_transfer,wagtailmetadata,weasyprint,yaml
+known_third_party = PyPDF2,arrow,bleach,bs4,captcha,celery,dateutil,django,environ,faker,fastjsonschema,icalevnt,markdown,modelcluster,pirates,pytest,pytz,requests,sentry_sdk,taggit,tweepy,wagtail,wagtailmetadata,weasyprint,yaml
diff --git a/Dockerfile b/Dockerfile
index 9a8045fd..08b4f2b3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -29,7 +29,6 @@ ENV DJANGO_SETTINGS_MODULE "majak.settings.production"
# fake values for required env variables used to run collectstatic during build
RUN DJANGO_SECRET_KEY=x DATABASE_URL=postgres://x/x DJANGO_ALLOWED_HOSTS=x \
OIDC_RP_CLIENT_ID=x OIDC_RP_CLIENT_SECRET=x OIDC_RP_REALM_URL=x \
- WAGTAILTRANSFER_SECRET_KEY=x \
python manage.py collectstatic
EXPOSE 8000
diff --git a/README.md b/README.md
index 259a0032..0b4ba971 100644
--- a/README.md
+++ b/README.md
@@ -148,7 +148,6 @@ V produkci musí být navíc nastaveno:
| `DJANGO_ALLOWED_HOSTS` | | allowed hosts (více hodnot odděleno čárkami) |
| `CELERY_BROKER_URL` | | URL pro Celery Broker |
| `CELERY_RESULT_BACKEND` | | URL pro Celery Result Backend |
-| `WAGTAILTRANSFER_SECRET_KEY` | | tajný klíč pro transfer stránek |
Různé:
@@ -158,7 +157,6 @@ Různé:
| `SENTRY_DSN` | | pokud je zadáno, pády se reportují do Sentry |
| `SEARCH_CONFIG` | english | nastavení jazyka fulltextového vyhledávání, viz níže |
| `DEBUG_TOOLBAR` | False | zobrazit Django Debug Toolbar (pro vývoj) |
-| `WAGTAILTRANSFER_SOURCES` | {} | `dict` s konfigurací zdrojů pro transfer stránek |
Settings pro appky na weby:
diff --git a/majak/settings/base.py b/majak/settings/base.py
index bad6d65a..7672ef0c 100644
--- a/majak/settings/base.py
+++ b/majak/settings/base.py
@@ -72,7 +72,6 @@ INSTALLED_APPS = [
"wagtail.core",
"wagtailmetadata",
"wagtail_trash",
- "wagtail_transfer",
"modelcluster",
"taggit",
"django_extensions",
@@ -260,16 +259,6 @@ WAGTAILEMBEDS_RESPONSIVE_HTML = True
BASE_URL = env.str("BASE_URL", default="https://majak.pirati.cz")
WAGTAILADMIN_BASE_URL = BASE_URL
-# WAGTAIL TRANSFER SETTINGS
-# ------------------------------------------------------------------------------
-
-WAGTAILTRANSFER_SOURCES = env.json("WAGTAILTRANSFER_SOURCES", default={})
-WAGTAILTRANSFER_UPDATE_RELATED_MODELS = ["wagtailimages.Image", "wagtaildocs.Document"]
-WAGTAILTRANSFER_LOOKUP_FIELDS = {
- "users.User": ["sso_id"],
- "taggit.tag": ["slug"],
-}
-
# CUSTOM SETTINGS
# ------------------------------------------------------------------------------
MAJAK_ENV = env.str("MAJAK_ENV", default="prod")
diff --git a/majak/settings/dev.py b/majak/settings/dev.py
index 84a953fb..a58152a4 100644
--- a/majak/settings/dev.py
+++ b/majak/settings/dev.py
@@ -8,9 +8,6 @@ SECRET_KEY = env("DJANGO_SECRET_KEY", default="58asda4d6nasd*jkj!dbska83asd54")
ALLOWED_HOSTS = env.list("DJANGO_ALLOWED_HOSTS", default=["*"])
INSTALLED_APPS += ["wagtail.contrib.styleguide"]
MAJAK_ENV = env.str("MAJAK_ENV", default="dev")
-WAGTAILTRANSFER_SECRET_KEY = env.str(
- "WAGTAILTRANSFER_SECRET_KEY", default="sfdjhfssah856asjhd"
-)
# django-debug-toolbar
# ------------------------------------------------------------------------------
diff --git a/majak/settings/production.py b/majak/settings/production.py
index 36645db3..33c990f1 100644
--- a/majak/settings/production.py
+++ b/majak/settings/production.py
@@ -18,7 +18,6 @@ SECURE_HSTS_SECONDS = 518400
SECURE_HSTS_INCLUDE_SUBDOMAINS = True
SECURE_HSTS_PRELOAD = True
SECURE_CONTENT_TYPE_NOSNIFF = True
-WAGTAILTRANSFER_SECRET_KEY = env.str("WAGTAILTRANSFER_SECRET_KEY")
# TEMPLATES
# ------------------------------------------------------------------------------
diff --git a/majak/urls.py b/majak/urls.py
index 478994bb..7967cf7c 100644
--- a/majak/urls.py
+++ b/majak/urls.py
@@ -7,7 +7,6 @@ from wagtail.admin import urls as wagtailadmin_urls
from wagtail.contrib.sitemaps.views import sitemap
from wagtail.core import urls as wagtail_urls
from wagtail.documents import urls as wagtaildocs_urls
-from wagtail_transfer import urls as wagtailtransfer_urls
from elections2021 import views as elections2021_views
from maps_utils import urls as maps_utils_urls
@@ -28,7 +27,6 @@ urlpatterns = [
path("captcha/", include(captcha.urls)),
path("seznam-webu/", SitesListView.as_view()),
path("sitemap.xml", sitemap),
- path("wagtail-transfer/", include(wagtailtransfer_urls)),
] + pirates_urlpatterns
diff --git a/requirements/base.in b/requirements/base.in
index a5ce82ca..0cd088a7 100644
--- a/requirements/base.in
+++ b/requirements/base.in
@@ -1,7 +1,6 @@
wagtail
wagtail-metadata
wagtail-trash
-wagtail-transfer
django-environ
django-extensions
django-redis
diff --git a/requirements/base.txt b/requirements/base.txt
index 211b0de4..e07195ba 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -272,8 +272,6 @@ wagtail==4.1.1
# wagtail-trash
wagtail-metadata==4.0.2
# via -r base.in
-wagtail-transfer==0.8.5
- # via -r base.in
wagtail-trash==0.3.0
# via -r base.in
wcwidth==0.2.6
--
GitLab