summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorManuela Kuhn <36827019+manuelakuhn@users.noreply.github.com>2023-07-16 01:05:15 +0200
committerGitHub <noreply@github.com>2023-07-15 18:05:15 -0500
commit5e7f9890191da99646a09a103ac4d510a99c5c03 (patch)
treec0e4df406ab847575fff2ee71731344b350ba012 /var
parent319ef0f459cc682c4eb1ff577f0924c65ad06558 (diff)
downloadspack-5e7f9890191da99646a09a103ac4d510a99c5c03.tar.gz
spack-5e7f9890191da99646a09a103ac4d510a99c5c03.tar.bz2
spack-5e7f9890191da99646a09a103ac4d510a99c5c03.tar.xz
spack-5e7f9890191da99646a09a103ac4d510a99c5c03.zip
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 <ajstewart426@gmail.com> --------- Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/py-jinja2/package.py3
1 files changed, 3 insertions, 0 deletions
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")