Merge branch '3.1.x'

diff --cc pyproject.toml
index 2b6f6259ccbc19e93fc617b7d10627c84a4e592b,c59feefca55e5b8b10cb19ebdaff80e42a9d8400..7f56da3933e9e900797de417018ff57d0a529138
--- 1/pyproject.toml
--- 2/pyproject.toml
+++ b/pyproject.toml
@@@ -41,10 -42,9 +42,10 @@@ name = "jinja2
  [tool.flit.sdist]
  include = [
      "docs/",
 +    "examples/",
      "requirements/",
      "tests/",
-     "CHANGES.rst",
+     "CHANGES.md",
      "tox.ini",
  ]
  exclude = [
@@@ -70,12 -70,29 +71,31 @@@ files = ["src/jinja2"
  show_error_codes = true
  pretty = true
  strict = true
 +local_partial_types = true
 +warn_unreachable = true
  
- [[tool.mypy.overrides]]
- module = [
-     "jinja2.defaults",
-     "markupsafe",
+ [tool.pyright]
+ pythonVersion = "3.8"
+ include = ["src/jinja2"]
+ typeCheckingMode = "basic"
+ 
+ [tool.ruff]
+ src = ["src"]
+ fix = true
+ show-fixes = true
+ output-format = "full"
+ 
+ [tool.ruff.lint]
+ select = [
+     "B",  # flake8-bugbear
+     "E",  # pycodestyle error
+     "F",  # pyflakes
+     "I",  # isort
+     "UP",  # pyupgrade
+     "W",  # pycodestyle warning
  ]
- no_implicit_reexport = false
+ ignore-init-module-imports = true
+ 
+ [tool.ruff.lint.isort]
+ force-single-line = true
+ order-by-type = false

diff --cc src/jinja2/__init__.py
Simple merge

diff --cc src/jinja2/environment.py
index c9afae311928420edfaa83e4e9b97dc9bf18b9af,1d3be0bed08d710f2a93079d62552d63fb09b627..09bfa0eb131aab44952b8eae3e1d6d9893886700
--- 1/src/jinja2/environment.py
--- 2/src/jinja2/environment.py
+++ b/src/jinja2/environment.py
@@@ -672,7 -672,7 +674,7 @@@ class Environment
              stream = ext.filter_stream(stream)  # type: ignore
  
              if not isinstance(stream, TokenStream):
-                 stream = TokenStream(stream, name, filename)  # type: ignore
 -                stream = TokenStream(stream, name, filename)
++                stream = TokenStream(stream, name, filename)  # type: ignore[unreachable]
  
          return stream
  

diff --cc src/jinja2/loaders.py
Simple merge

diff --cc src/jinja2/parser.py
Simple merge

diff --cc src/jinja2/runtime.py
Simple merge