diff options
| author | Manuela Kuhn <36827019+manuelakuhn@users.noreply.github.com> | 2023-06-27 23:37:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-27 16:37:28 -0500 |
| commit | 84043d97b7b996f03dd8cf514647ca49e08cf1ed (patch) | |
| tree | e78bfc22eb0048b2cca591c2fdcd7ffcf968a0db /var | |
| parent | f93b61338c610c6c4b134bad20d43ca87c554f8a (diff) | |
| download | spack-84043d97b7b996f03dd8cf514647ca49e08cf1ed.tar.gz spack-84043d97b7b996f03dd8cf514647ca49e08cf1ed.tar.bz2 spack-84043d97b7b996f03dd8cf514647ca49e08cf1ed.tar.xz spack-84043d97b7b996f03dd8cf514647ca49e08cf1ed.zip | |
py-ruamel-yaml: add 0.17.32 and py-ruamel-yaml-clib: add 0.2.7 (#38585)
* py-ruamel-yaml: add 0.17.32 and py-ruamel-yaml-clib: add 0.2.7
* Update var/spack/repos/builtin/packages/py-ruamel-yaml/package.py
Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
* Fix style
* Fix python dependency
---------
Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/py-ruamel-yaml-clib/package.py | 5 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/py-ruamel-yaml/package.py | 14 |
2 files changed, 14 insertions, 5 deletions
diff --git a/var/spack/repos/builtin/packages/py-ruamel-yaml-clib/package.py b/var/spack/repos/builtin/packages/py-ruamel-yaml-clib/package.py index d58976c89c..3670af34ef 100644 --- a/var/spack/repos/builtin/packages/py-ruamel-yaml-clib/package.py +++ b/var/spack/repos/builtin/packages/py-ruamel-yaml-clib/package.py @@ -14,7 +14,10 @@ class PyRuamelYamlClib(PythonPackage): homepage = "https://sourceforge.net/p/ruamel-yaml-clib/code/ci/default/tree/" pypi = "ruamel.yaml.clib/ruamel.yaml.clib-0.2.0.tar.gz" + version("0.2.7", sha256="1f08fd5a2bea9c4180db71678e850b995d2a5f4537be0e94557668cf0f5f9497") version("0.2.0", sha256="b66832ea8077d9b3f6e311c4a53d06273db5dc2db6e8a908550f3c14d67e718c") - depends_on("python@2.7:2.8,3.5:", type=("build", "link", "run")) + depends_on("python", type=("build", "link", "run")) + # to prevent legacy-install-failure + depends_on("python@:3.9", when="@0.2.0", type=("build", "link", "run")) depends_on("py-setuptools@28.7.0:", type="build") diff --git a/var/spack/repos/builtin/packages/py-ruamel-yaml/package.py b/var/spack/repos/builtin/packages/py-ruamel-yaml/package.py index c46015f9dd..907ca086a0 100644 --- a/var/spack/repos/builtin/packages/py-ruamel-yaml/package.py +++ b/var/spack/repos/builtin/packages/py-ruamel-yaml/package.py @@ -15,16 +15,22 @@ class PyRuamelYaml(PythonPackage): homepage = "https://sourceforge.net/p/ruamel-yaml/code/ci/default/tree" pypi = "ruamel.yaml/ruamel.yaml-0.16.10.tar.gz" + version("0.17.32", sha256="ec939063761914e14542972a5cba6d33c23b0859ab6342f61cf070cfc600efc2") version("0.17.16", sha256="1a771fc92d3823682b7f0893ad56cb5a5c87c48e62b5399d6f42c8759a583b33") version("0.16.10", sha256="099c644a778bf72ffa00524f78dd0b6476bca94a1da344130f4bf3381ce5b954") version("0.16.5", sha256="412a6f5cfdc0525dee6a27c08f5415c7fd832a7afcb7a0ed7319628aed23d408") version("0.11.7", sha256="c89363e16c9eafb9354e55d757723efeff8682d05e56b0881450002ffb00a344") - depends_on("python@2.7:2.8,3.5:", type=("build", "run")) - depends_on("python@3.5:", when="@0.17:", type=("build", "run")) - depends_on("py-setuptools", type="build") + # from `supported` in __init__.py + depends_on("python@3.7:", when="@0.17.22:", type=("build", "run")) + # from setup.py depends_on("py-setuptools@28.7:", when="@0.17:", type=("build")) - depends_on("py-ruamel-yaml-clib@0.1.2:", when="@0.16:^python@:3.8", type=("build", "run")) + depends_on("py-setuptools", type="build") + # from __init__.py + depends_on("py-ruamel-yaml-clib@0.2.7:", when="@0.17.23: ^python@:3.11", type=("build", "run")) + depends_on( + "py-ruamel-yaml-clib@0.1.2:", when="@0.16:0.17.22 ^python@:3.8", type=("build", "run") + ) @run_after("install") def fix_import_error(self): |