Push for release

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = wagtail_fedit
-version = 1.5.0a3
+version = 1.5.0
 description = Frontend editing for your Wagtail site
 long_description = file: README.md
 long_description_content_type = text/markdown

wagtail_fedit/templatetags/fedit.py

@@ -202,13 +202,13 @@ def wrap_adapter(request: HttpRequest, adapter: BaseAdapter, context: dict, run_
     )
 
 @register.simple_tag(takes_context=True)
-def render_adapter(context: dict, adapter: BaseAdapter) -> str:
-    context = context.flatten()
+def render_adapter(context: Context, adapter: BaseAdapter) -> str:
+    parent_context = {}
 
-    parent_context = context.pop("parent_context", {})
-    if isinstance(parent_context, Context):
-        parent_context = parent_context.flatten()
-        
+    if "parent_context" in context:
+        parent_context = context["parent_context"]
+        del context["parent_context"]
+
     context.update(parent_context)
 
     context["wagtail_fedit_field"]    = adapter.field_name

wagtail_fedit/test/core/tests/test_adapters.py

@@ -193,6 +193,7 @@ def test_context_processors_run(self):
             True,
         )
 
+        # In this test we are testing the adapter - not the template.
         tpl = tpl.render(
             Context({
                 "request": request,