From 590dbf67f3682b0b7046b97e16ef5a768ef74a0d Mon Sep 17 00:00:00 2001 From: Krishna Chilleri Date: Wed, 19 Mar 2025 16:46:00 -0600 Subject: [PATCH] py-cwl-utils: add v0.37 and py-schema-salad: add v8.8.20250205075315 (#49566) * add new version * add v8.8.20250205075315 to py-schema-salad * Modify range to open ended Co-authored-by: Wouter Deconinck * Add open ended dependency version range Co-authored-by: Wouter Deconinck * fix flake8 error --------- Co-authored-by: Wouter Deconinck --- .../builtin/packages/py-cwl-utils/package.py | 17 ++++++++++++++++- .../builtin/packages/py-schema-salad/package.py | 13 +++++++++++-- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/var/spack/repos/builtin/packages/py-cwl-utils/package.py b/var/spack/repos/builtin/packages/py-cwl-utils/package.py index 4d090a4b400..bc880984107 100644 --- a/var/spack/repos/builtin/packages/py-cwl-utils/package.py +++ b/var/spack/repos/builtin/packages/py-cwl-utils/package.py @@ -16,9 +16,11 @@ class PyCwlUtils(PythonPackage): license("Apache-2.0") + version("0.37", sha256="7b69c948f8593fdf44b44852bd8ef94c666736ce0ac12cf6e66e2a72ad16a773") version("0.21", sha256="583f05010f7572f3a69310325472ccb6efc2db7f43dc6428d03552e0ffcbaaf9") depends_on("python@3.6:", type=("build", "run")) + depends_on("python@3.8:", when="@0.29:", type=("build", "run")) depends_on("py-setuptools", type="build") depends_on("py-cwl-upgrader@1.2.3:", type=("build", "run")) @@ -26,4 +28,17 @@ class PyCwlUtils(PythonPackage): depends_on("py-rdflib", type=("build", "run")) depends_on("py-requests", type=("build", "run")) depends_on("py-cachecontrol", type=("build", "run")) - depends_on("py-schema-salad@8.3.20220825114525:8", type=("build", "run")) + depends_on("py-schema-salad@8.3.20220825114525:8", when="@:0.31", type=("build", "run")) + # intermediate versions 0.32:0.36 may not require 8.8, but should work with this stricter + # requirement + depends_on("py-schema-salad@8.8.20250205075315:8", when="@0.32:", type=("build", "run")) + depends_on("py-ruamel-yaml@0.17.6:0.18", when="@0.30:", type=("build", "run")) + depends_on("py-typing-extensions", when="@0.37 ^python@:3.9", type=("build", "run")) + + def url_for_version(self, version): + url = "https://files.pythonhosted.org/packages/source/c/cwl-utils/cwl{}utils-{}.tar.gz" + if version >= Version("0.34"): + sep = "_" + else: + sep = "-" + return url.format(sep, version) diff --git a/var/spack/repos/builtin/packages/py-schema-salad/package.py b/var/spack/repos/builtin/packages/py-schema-salad/package.py index 47793b15ae3..0860d59b0c2 100644 --- a/var/spack/repos/builtin/packages/py-schema-salad/package.py +++ b/var/spack/repos/builtin/packages/py-schema-salad/package.py @@ -13,6 +13,10 @@ class PySchemaSalad(PythonPackage): pypi = "schema-salad/schema_salad-8.7.20241021092521.tar.gz" license("Apache-2.0") + version( + "8.8.20250205075315", + sha256="444a45509fb048347e0ec205b2af6390f0bb145f7183716ba6af2f75a22b8bdd", + ) version( "8.7.20241021092521", sha256="287b27adff70e55dd715bfbea18bb1a58fd73de14b4273be4038559308089cdf", @@ -33,18 +37,23 @@ class PySchemaSalad(PythonPackage): depends_on("py-ruamel-yaml@0.17.6:0.18", when="@8.4.20231113094720:", type=("build", "run")) depends_on("py-rdflib@4.2.2:6", type=("build", "run")) depends_on("py-mistune@2.0.3:2.0", type=("build", "run")) - depends_on("py-cachecontrol@0.11.7:0.12+filecache", type=("build", "run")) + depends_on( + "py-cachecontrol@0.11.7:0.12+filecache", when="@:8.7.20240718183047", type=("build", "run") + ) depends_on( "py-cachecontrol@0.13.1:0.14+filecache", when="@8.7.20240820070935:8.7.20241021092521", type=("build", "run"), ) - + depends_on( + "py-cachecontrol@0.14:0.14+filecache", when="@8.8.20241204110045:", type=("build", "run") + ) depends_on("py-setuptools-scm@6.2:+toml", type="build") depends_on("py-setuptools-scm@8.0.4:8+toml", when="@8.4.20231024070348:", type="build") depends_on("py-mypy@0.961", when="@8.3.20220717184004:8.3.20221028160159", type="build") depends_on("py-mypy@0.991", when="@8.3.20221209165047:8.4.20230201194352", type="build") depends_on("py-mypy@1.12.1", when="@8.7.20241021092521", type="build") + depends_on("py-mypy@1.15.0", when="@8.8.20250205075315", type="build") depends_on("py-black@19.10b0:", type="build") depends_on("py-black@19.10b0:24.10", when="@8.7.20241021092521:", type="build") depends_on("py-types-pkg-resources", when="@:8.4.20231117150958", type="build")