summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWouter Deconinck <wdconinc@gmail.com>2024-10-02 23:32:27 -0500
committerGitHub <noreply@github.com>2024-10-02 22:32:27 -0600
commit6e0efdff612fe8f7b2b006d9f9f68b478bbd824b (patch)
tree481e6f5cfd5c6e0542464962b8c44ceafab03d32
parent95f16f203ab25802dab5a6818c2810406a66ff80 (diff)
downloadspack-6e0efdff612fe8f7b2b006d9f9f68b478bbd824b.tar.gz
spack-6e0efdff612fe8f7b2b006d9f9f68b478bbd824b.tar.bz2
spack-6e0efdff612fe8f7b2b006d9f9f68b478bbd824b.tar.xz
spack-6e0efdff612fe8f7b2b006d9f9f68b478bbd824b.zip
py-jinja2: add v3.1.4 (fix CVE) (#46668)
* py-jinja2: add v3.1.4 (fix CVE) * py-jinja2: fix py-flit-core upper limit * py-jinja2: url_for_version due to lowercase jinja2
-rw-r--r--var/spack/repos/builtin/packages/py-jinja2/package.py15
1 files changed, 13 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/py-jinja2/package.py b/var/spack/repos/builtin/packages/py-jinja2/package.py
index 07ac0c8acf..fe6afd0773 100644
--- a/var/spack/repos/builtin/packages/py-jinja2/package.py
+++ b/var/spack/repos/builtin/packages/py-jinja2/package.py
@@ -12,11 +12,12 @@ class PyJinja2(PythonPackage):
and an optional sandboxed environment."""
homepage = "https://palletsprojects.com/p/jinja/"
- pypi = "Jinja2/Jinja2-2.10.3.tar.gz"
+ pypi = "jinja2/jinja2-3.1.4.tar.gz"
git = "https://github.com/pallets/jinja"
license("BSD-3-Clause")
+ version("3.1.4", sha256="4a3aee7acbbe7303aede8e9648d13b8bf88a429282aa6122a993f0ac800cb369")
version("3.1.2", sha256="31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852")
version("3.0.3", sha256="611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7")
version("3.0.1", sha256="703f484b47a6af502e743c9122595cc812b0271f661722403114f71a79d0f5a4")
@@ -33,10 +34,12 @@ class PyJinja2(PythonPackage):
variant("i18n", default=False, description="Enables I18N support with Babel")
+ depends_on("python@3.8:", when="@3.1.4:", type=("build", "run"))
depends_on("python@3.7:", when="@3.1:", type=("build", "run"))
depends_on("python@3.6:", when="@3:", type=("build", "run"))
depends_on("python@2.7:2.8,3.5:", type=("build", "run"))
- depends_on("py-setuptools", type="build")
+ depends_on("py-setuptools", when="@:3.1.3", type="build")
+ depends_on("py-flit-core@:3", when="@3.1.4:", type="build")
depends_on("py-markupsafe@2.0:", when="@3:", type=("build", "run"))
depends_on("py-markupsafe@0.23:", type=("build", "run"))
depends_on("py-babel@2.7:", when="@3:+i18n", type=("build", "run"))
@@ -44,3 +47,11 @@ class PyJinja2(PythonPackage):
# https://github.com/pallets/jinja/issues/1585
conflicts("^py-markupsafe@2.1:", when="@:2")
+
+ def url_for_version(self, version):
+ url = "https://files.pythonhosted.org/packages/source/j/jinja2/"
+ if self.spec.satisfies("@:3.1.3"):
+ url += "Jinja2-{0}.tar.gz"
+ else:
+ url += "jinja2-{0}.tar.gz"
+ return url.format(version)