summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorMatt Thompson <matthew.thompson@nasa.gov>2024-08-19 04:05:39 -0400
committerGitHub <noreply@github.com>2024-08-19 10:05:39 +0200
commit796617054de961ab9c2e5ed581d78b545470fd34 (patch)
tree6808b90da6a26d0710a63ec881edc670cd915411 /var
parent78fc25ec125288862430a5226ac1c3815c553d6d (diff)
downloadspack-796617054de961ab9c2e5ed581d78b545470fd34.tar.gz
spack-796617054de961ab9c2e5ed581d78b545470fd34.tar.bz2
spack-796617054de961ab9c2e5ed581d78b545470fd34.tar.xz
spack-796617054de961ab9c2e5ed581d78b545470fd34.zip
py-pyyaml: add v6.0.2 (#45716)
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/py-pyyaml/package.py21
1 files changed, 19 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/py-pyyaml/package.py b/var/spack/repos/builtin/packages/py-pyyaml/package.py
index 1e995439a2..7093ec8dd8 100644
--- a/var/spack/repos/builtin/packages/py-pyyaml/package.py
+++ b/var/spack/repos/builtin/packages/py-pyyaml/package.py
@@ -10,11 +10,19 @@ class PyPyyaml(PythonPackage):
"""PyYAML is a YAML parser and emitter for Python."""
homepage = "https://pyyaml.org/wiki/PyYAML"
- pypi = "PyYAML/PyYAML-5.3.1.tar.gz"
+ pypi = "pyyaml/pyyaml-6.0.2.tar.gz"
git = "https://github.com/yaml/pyyaml.git"
+ maintainers("mathomp4")
+
license("MIT")
+ # Advice for Maintainers:
+ # PyYAML went from a mixed case tarfile name to a lowercase one in 6.0.2
+ # (see url_for_version below). Since "spack checksum" does not use url_for_version,
+ # for versions older than 6.0.2, you'll need to use "spack checksum py-pyyaml x.y.z"
+ # as we changed the pypi url above to lowercase.
+ version("6.0.2", sha256="d584d9ec91ad65861cc08d42e834324ef890a082e591037abe114850ff7bbc3e")
version("6.0.1", sha256="bfdf460b1736c775f2ba9f6a92bca30bc2095067b8a9d77876d1fad6cc3b4a43")
version("6.0", sha256="68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2")
version("5.4.1", sha256="607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e")
@@ -38,7 +46,16 @@ class PyPyyaml(PythonPackage):
conflicts("^python@3.11:", when="@:5.3")
# https://github.com/yaml/pyyaml/issues/601
- conflicts("^py-cython@3:")
+ # 6.0.2+ do now support Cython 3 per release notes
+ conflicts("^py-cython@3:", when="@:6.0.1")
+
+ # With pyyaml 6.0.2, the tarfile changed from PyYAML-6.0.1.tar.gz to pyyaml-6.0.2.tar.gz
+ def url_for_version(self, version):
+ if version >= Version("6.0.2"):
+ url = "https://pypi.io/packages/source/p/pyyaml/pyyaml-{0}.tar.gz"
+ else:
+ url = "https://pypi.io/packages/source/P/PyYAML/PyYAML-{0}.tar.gz"
+ return url.format(version.dotted)
@property
def import_modules(self):