diff options
author | Wouter Deconinck <wdconinc@gmail.com> | 2024-10-04 15:34:48 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-10-04 22:34:48 +0200 |
commit | bfbd0a4d4c1ff7a3e2463c4b2d94f825f00cd7b7 (patch) | |
tree | a128a4da981842d98de19039e8f66fa61290c16a | |
parent | be21b0b3bf632112a0d61dc22e9544da36b9cedb (diff) | |
download | spack-bfbd0a4d4c1ff7a3e2463c4b2d94f825f00cd7b7.tar.gz spack-bfbd0a4d4c1ff7a3e2463c4b2d94f825f00cd7b7.tar.bz2 spack-bfbd0a4d4c1ff7a3e2463c4b2d94f825f00cd7b7.tar.xz spack-bfbd0a4d4c1ff7a3e2463c4b2d94f825f00cd7b7.zip |
py-cookiecutter: add v2.6.0 (fix CVE) (#46762)
* py-cookiecutter: add v2.6.0
* py-poyo: add v0.5.0
* py-poyo: fix style
-rw-r--r-- | var/spack/repos/builtin/packages/py-cookiecutter/package.py | 30 | ||||
-rw-r--r-- | var/spack/repos/builtin/packages/py-poyo/package.py | 1 |
2 files changed, 25 insertions, 6 deletions
diff --git a/var/spack/repos/builtin/packages/py-cookiecutter/package.py b/var/spack/repos/builtin/packages/py-cookiecutter/package.py index 75e0d3e29d..5278444389 100644 --- a/var/spack/repos/builtin/packages/py-cookiecutter/package.py +++ b/var/spack/repos/builtin/packages/py-cookiecutter/package.py @@ -16,14 +16,32 @@ class PyCookiecutter(PythonPackage): license("BSD-3-Clause") - version("1.6.0", sha256="0c9018699b556b83d7c37b27fe0cc17485b90b6e1f47365b3cdddf77f6ca9d36") + version("2.6.0", sha256="da014a94d85c1b1be14be214662982c8c90d860834cbf9ddb2391a37ad7d08be") + with default_args(deprecated=True): + # https://nvd.nist.gov/vuln/detail/CVE-2022-24065 + version("1.7.3", sha256="5c16f9e33875f49bb091ef836b71ced63372aadc49799d78315db1d91d17d76d") + version("1.6.0", sha256="0c9018699b556b83d7c37b27fe0cc17485b90b6e1f47365b3cdddf77f6ca9d36") depends_on("py-setuptools", type="build") - depends_on("py-future@0.15.2:", type=("build", "run")) depends_on("py-binaryornot@0.2.0:", type=("build", "run")) - depends_on("py-jinja2@2.7:", type=("build", "run")) + depends_on("py-binaryornot@0.4.4:", type=("build", "run"), when="@1.7.1:") + depends_on("py-jinja2@2.7:3", type=("build", "run")) depends_on("py-click@5.0:", type=("build", "run")) - depends_on("py-whichcraft@0.4.0:", type=("build", "run")) - depends_on("py-poyo@0.1.0:", type=("build", "run")) - depends_on("py-jinja2-time@0.1.0:", type=("build", "run")) + depends_on("py-click@7.0:", type=("build", "run"), when="@1.7:") + depends_on("py-click@:7", type=("build", "run"), when="@:2.0") + depends_on("py-click@:8", type=("build", "run"), when="@2.1:") + depends_on("py-pyyaml@5.3.1:", type=("build", "run"), when="@2:") + depends_on("py-python-slugify@4:", type=("build", "run"), when="@1.7.1:") depends_on("py-requests@2.18.0:", type=("build", "run")) + depends_on("py-requests@2.23.0:", type=("build", "run"), when="@1.7.1:") + depends_on("py-arrow", type=("build", "run"), when="@2.2:") + depends_on("py-rich", type=("build", "run"), when="@2.3:") + + # Historical dependencies + depends_on("py-future@0.15.2:", type=("build", "run"), when="@:1.7.0") + depends_on("py-whichcraft@0.4.0:", type=("build", "run"), when="@:1") + depends_on("py-poyo@0.1.0:", type=("build", "run"), when="@:1") + depends_on("py-poyo@0.5.0:", type=("build", "run"), when="@1.7.1:1") + depends_on("py-jinja2-time@0.1.0:", type=("build", "run"), when="@:2.1") + depends_on("py-jinja2-time@0.2.0:", type=("build", "run"), when="@1.7.1:2.1") + depends_on("py-six@1.10:", type=("build", "run"), when="@1.7.2:1") diff --git a/var/spack/repos/builtin/packages/py-poyo/package.py b/var/spack/repos/builtin/packages/py-poyo/package.py index d6011ec5ce..9a3c1fe27d 100644 --- a/var/spack/repos/builtin/packages/py-poyo/package.py +++ b/var/spack/repos/builtin/packages/py-poyo/package.py @@ -14,6 +14,7 @@ class PyPoyo(PythonPackage): license("MIT") + version("0.5.0", sha256="cf75b237ff3efdde8a573512d7356c428033c77a6ccee50a89496b2654cf9420") version("0.4.1", sha256="9f069dc9c8ee359abc8ef9e7304cb1b1c23556d1f4ae64f4247c1e45de43c1f1") depends_on("py-setuptools", type="build") |