From: David Lord <davidism@gmail.com>
Date: Mon, 13 May 2024 15:47:27 +0000 (-0700)
Subject: Merge branch '3.1.x'
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=b002d9c6c3acf5c88167894a4963757d5d56b278;p=thirdparty%2Fjinja.git

Merge branch '3.1.x'
---

b002d9c6c3acf5c88167894a4963757d5d56b278
diff --cc CHANGES.rst
index 758beaeb,7fb72976..f23b6c96
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@@ -1,16 -1,21 +1,32 @@@
  .. currentmodule:: jinja2
  
 +Version 3.2.0
 +-------------
 +
 +Unreleased
 +
 +-   Drop support for Python 3.7.
 +-   Use modern packaging metadata with ``pyproject.toml`` instead of ``setup.cfg``.
 +    :pr:`1793`
 +-   Use ``flit_core`` instead of ``setuptools`` as build backend.
 +
 +
+ Version 3.1.5
+ -------------
+ 
+ Unreleased
+ 
+ -   Calling sync ``render`` for an async template uses ``asyncio.run``.
+     :pr:`1952`
+ -   Avoid unclosed ``auto_aiter`` warnings. :pr:`1960`
+ -   Return an ``aclose``-able ``AsyncGenerator`` from
+     ``Template.generate_async``. :pr:`1960`
+ -   Avoid leaving ``root_render_func()`` unclosed in
+     ``Template.generate_async``. :pr:`1960`
+ -   Avoid leaving async generators unclosed in blocks, includes and extends.
+     :pr:`1960`
+ 
+ 
  Version 3.1.4
  -------------
  
diff --cc tox.ini
index f7bc0b3b,b9e972b9..bb84c67e
--- a/tox.ini
+++ b/tox.ini
@@@ -1,6 -1,6 +1,6 @@@
  [tox]
  envlist =
-     py3{12,11,10,9,8}
 -    py3{13,12,11,10,9,8,7}
++    py3{13,12,11,10,9,8}
      pypy310
      style
      typing