From 5e7f9890191da99646a09a103ac4d510a99c5c03 Mon Sep 17 00:00:00 2001 From: Manuela Kuhn <36827019+manuelakuhn@users.noreply.github.com> Date: Sun, 16 Jul 2023 01:05:15 +0200 Subject: py-jinja2: add conflict for py-markupsafe@2.0.2 (#38913) * py-jinja2: add conflict for py-markupsafe@2.0.2 * Update var/spack/repos/builtin/packages/py-jinja2/package.py Co-authored-by: Adam J. Stewart --------- Co-authored-by: Adam J. Stewart --- var/spack/repos/builtin/packages/py-jinja2/package.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-jinja2/package.py b/var/spack/repos/builtin/packages/py-jinja2/package.py index a94f81dce0..a4c92d3594 100644 --- a/var/spack/repos/builtin/packages/py-jinja2/package.py +++ b/var/spack/repos/builtin/packages/py-jinja2/package.py @@ -39,3 +39,6 @@ class PyJinja2(PythonPackage): depends_on("py-markupsafe@0.23:", type=("build", "run")) depends_on("py-babel@2.7:", when="@3:+i18n", type=("build", "run")) depends_on("py-babel@0.8:", when="+i18n", type=("build", "run")) + + # https://github.com/pallets/jinja/issues/1585 + conflicts("^py-markupsafe@2.1:", when="@:2") -- cgit v1.2.3-60-g2f50