From 624245e0738c12c54fc7a389c1eb8646b66218fa Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 14 Jan 2021 17:28:18 +0100 Subject: [PATCH 1/3] requirements: Restore wagtail-modeltranslations Our changes have been merged into the latest release 0.10.15, so restore requirement to default source (PyPi). --- requirements/base.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/base.in b/requirements/base.in index ec5640a..45594a4 100644 --- a/requirements/base.in +++ b/requirements/base.in @@ -6,7 +6,7 @@ psycopg2-binary # Wagtail wagtail -git+https://github.com/buczek/wagtail-modeltranslation.git@add-toggle-configure +wagtail-modeltranslation markdown pygments From fdae5f5c0a3ab8d212e7aa255a9fabb95ac38f99 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 14 Jan 2021 17:30:11 +0100 Subject: [PATCH 2/3] Remove wagtail-modeltranslations patch Remove patch which has been merged upstream. --- patches/Fix-autogenerated-slugs.patch | 29 --------------------------- 1 file changed, 29 deletions(-) delete mode 100644 patches/Fix-autogenerated-slugs.patch diff --git a/patches/Fix-autogenerated-slugs.patch b/patches/Fix-autogenerated-slugs.patch deleted file mode 100644 index 15818d2..0000000 --- a/patches/Fix-autogenerated-slugs.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 35449e448200598d5b002d8e55ab8ece9ede0217 Mon Sep 17 00:00:00 2001 -From: Donald Buczek -Date: Sun, 23 Aug 2020 21:17:21 +0200 -Subject: [PATCH] Fix autogenerated slugs - -Fix bug in wagtail_modeltranslation which disables the autogeneration of -slugs. - -See https://github.com/infoportugal/wagtail-modeltranslation/issues/293 ---- - .../site-packages/wagtail_modeltranslation/wagtail_hooks.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/python3.7/site-packages/wagtail_modeltranslation/wagtail_hooks.py b/lib/python3.7/site-packages/wagtail_modeltranslation/wagtail_hooks.py -index 1bbff88..3b3d61f 100644 ---- a/lib/python3.7/site-packages/wagtail_modeltranslation/wagtail_hooks.py -+++ b/lib/python3.7/site-packages/wagtail_modeltranslation/wagtail_hooks.py -@@ -54,7 +54,7 @@ def translated_slugs(): - languages: [{languages}], - defaultLanguage: '{language_code}', - viewEditString: '{view_edit_string}', -- translate_slugs: '{translate_slugs}', -+ translate_slugs: {translate_slugs}, - }}; - - """.format( --- -2.26.2 - From b92e31a604035fcbb71ca0cbcdf52fd9b79f0b15 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 14 Jan 2021 17:33:10 +0100 Subject: [PATCH 3/3] Update requirements Update python requirements with (cd requirements; make) The virtual environment can be update to the specified versions with pip-sync requirements/dev.txt --- requirements/base.txt | 2 +- requirements/dev.txt | 2 +- requirements/production.txt | 2 +- requirements/test.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 91e7ff3..12cd52a 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -43,7 +43,7 @@ tablib[xls,xlsx]==2.0.0 # via wagtail tatsu==4.4.0 # via ics unidecode==1.1.1 # via wagtail urllib3==1.25.10 # via requests -git+https://github.com/buczek/wagtail-modeltranslation.git@add-toggle-configure # via -r base.in +wagtail-modeltranslation==0.10.15 # via -r base.in wagtail==2.10 # via -r base.in, wagtail-modeltranslation webencodings==0.5.1 # via html5lib willow==1.4 # via wagtail diff --git a/requirements/dev.txt b/requirements/dev.txt index 28bd067..e083f66 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -85,7 +85,7 @@ traitlets==4.3.3 # via ipython typed-ast==1.4.1 # via astroid unidecode==1.1.1 # via -r ./test.txt, wagtail urllib3==1.25.10 # via -r ./test.txt, requests -git+https://github.com/buczek/wagtail-modeltranslation.git@add-toggle-configure # via -r ./test.txt +wagtail-modeltranslation==0.10.15 # via -r ./test.txt wagtail==2.10 # via -r ./test.txt, wagtail-modeltranslation wcwidth==0.2.5 # via prompt-toolkit webencodings==0.5.1 # via -r ./test.txt, html5lib diff --git a/requirements/production.txt b/requirements/production.txt index ace3e17..54e5f5b 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -43,7 +43,7 @@ tablib[xls,xlsx]==2.0.0 # via -r ./base.txt, wagtail tatsu==4.4.0 # via -r ./base.txt, ics unidecode==1.1.1 # via -r ./base.txt, wagtail urllib3==1.25.10 # via -r ./base.txt, requests -git+https://github.com/buczek/wagtail-modeltranslation.git@add-toggle-configure # via -r ./base.txt +wagtail-modeltranslation==0.10.15 # via -r ./base.txt wagtail==2.10 # via -r ./base.txt, wagtail-modeltranslation webencodings==0.5.1 # via -r ./base.txt, html5lib willow==1.4 # via -r ./base.txt, wagtail diff --git a/requirements/test.txt b/requirements/test.txt index 6d6eb6d..b3850e1 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -59,7 +59,7 @@ tatsu==4.4.0 # via -r ./base.txt, ics toml==0.10.1 # via pytest unidecode==1.1.1 # via -r ./base.txt, wagtail urllib3==1.25.10 # via -r ./base.txt, requests -git+https://github.com/buczek/wagtail-modeltranslation.git@add-toggle-configure # via -r ./base.txt +wagtail-modeltranslation==0.10.15 # via -r ./base.txt wagtail==2.10 # via -r ./base.txt, wagtail-modeltranslation webencodings==0.5.1 # via -r ./base.txt, html5lib willow==1.4 # via -r ./base.txt, wagtail