diff --git a/var/spack/repos/builtin/packages/py-mypy/package.py b/var/spack/repos/builtin/packages/py-mypy/package.py index f4dfe702af4..ccd2df9fcf6 100644 --- a/var/spack/repos/builtin/packages/py-mypy/package.py +++ b/var/spack/repos/builtin/packages/py-mypy/package.py @@ -18,6 +18,7 @@ class PyMypy(PythonPackage): version("1.14.1", sha256="7ec88144fe9b510e8475ec2f5f251992690fcf89ccb4500b214b4226abcd32d6") version("1.13.0", sha256="0291a61b6fbf3e6673e3405cfcc0e7650bebc7939659fdca2702958038bd835e") + version("1.12.1", sha256="f5b3936f7a6d0e8280c9bdef94c7ce4847f5cdfc258fbb2c29a8c1711e8bb96d") version("1.11.2", sha256="7f9993ad3e0ffdc95c2a14b66dee63729f021968bff8ad911867579c65d13a79") version("1.11.1", sha256="f404a0b069709f18bbdb702eb3dcfe51910602995de00bd39cea3050b5772d08") version("1.10.1", sha256="1f8f492d7db9e3593ef42d4f115f04e556130f2819ad33ab84551403e97dd4c0") 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 0ea0c7b8721..47793b15ae3 100644 --- a/var/spack/repos/builtin/packages/py-schema-salad/package.py +++ b/var/spack/repos/builtin/packages/py-schema-salad/package.py @@ -10,28 +10,54 @@ class PySchemaSalad(PythonPackage): """Schema Annotations for Linked Avro Data (SALAD)""" homepage = "https://github.com/common-workflow-language/schema_salad" - pypi = "schema-salad/schema-salad-8.3.20221209165047.tar.gz" + pypi = "schema-salad/schema_salad-8.7.20241021092521.tar.gz" license("Apache-2.0") - + version( + "8.7.20241021092521", + sha256="287b27adff70e55dd715bfbea18bb1a58fd73de14b4273be4038559308089cdf", + ) version( "8.3.20221209165047", sha256="d97cc9a4d7c4255eb8000bcebaa8ac0d1d31801c921fd4113ab3051c1e326c7c", ) depends_on("python@3.6:", type=("build", "run")) + depends_on("python@3.8:", when="@8.4.20230927144413:", type=("build", "run")) + depends_on("python@3.9:", when="@8.7.20241021092521:", type=("build", "run")) depends_on("py-setuptools@45:", type="build") + depends_on("py-setuptools@50:", when="@8.4.20231117150958:", type="build") depends_on("py-requests@1:", type=("build", "run")) depends_on("py-ruamel-yaml@0.17.6:0.17.21", type=("build", "run")) + 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.13.1:0.14+filecache", + when="@8.7.20240820070935:8.7.20241021092521", + type=("build", "run"), + ) depends_on("py-setuptools-scm@6.2:+toml", type="build") - depends_on("py-mypy@0.991", 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-black@19.10b0:", type="build") - depends_on("py-types-pkg-resources", 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") depends_on("py-types-requests", type="build") depends_on("py-types-dataclasses", type="build") depends_on("py-types-setuptools", type="build") + + def url_for_version(self, version): + url = ( + "https://files.pythonhosted.org/packages/source/s/schema-salad/schema{}salad-{}.tar.gz" + ) + if version >= Version("8.5.20240503091721"): + sep = "_" + else: + sep = "-" + return url.format(sep, version)