diff --git a/amaranth/build/plat.py b/amaranth/build/plat.py index ca2d1d8e8..6fc6ad0a9 100644 --- a/amaranth/build/plat.py +++ b/amaranth/build/plat.py @@ -375,7 +375,7 @@ def get_override(var): else: return jinja2.Undefined(name=var) - @jinja2.contextfunction + @jinja2.pass_context def invoke_tool(context, name): env_var = tool_env_var(name) if context.parent["syntax"] == "sh": diff --git a/setup.py b/setup.py index 3f9394b0a..28116d6f2 100644 --- a/setup.py +++ b/setup.py @@ -43,7 +43,7 @@ def doc_version(): "importlib_metadata; python_version<'3.8'", # for __version__ and amaranth._toolchain.yosys "importlib_resources; python_version<'3.9'", # for amaranth._toolchain.yosys "pyvcd~=0.2.2", # for amaranth.pysim - "Jinja2>=2.11,<4.0", # for amaranth.build + "Jinja2~=3.0", # for amaranth.build ], extras_require={ # this version requirement needs to be synchronized with the one in amaranth.back.verilog!