From 7171015f1c8cd192f528ab72842d0d0dd25b2f68 Mon Sep 17 00:00:00 2001 From: Harmen Stoppels Date: Sun, 12 Jan 2025 17:18:09 +0100 Subject: [PATCH] py-mypy: add v1.13.0 and v1.14.1 (#48508) * py-setuptools: add v75.3.0, v75.8.0 * py-radical-utils: forward compat with setuptools --- var/spack/repos/builtin/packages/py-mypy/package.py | 6 +++--- .../repos/builtin/packages/py-radical-utils/package.py | 5 ++++- var/spack/repos/builtin/packages/py-setuptools/package.py | 2 ++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/var/spack/repos/builtin/packages/py-mypy/package.py b/var/spack/repos/builtin/packages/py-mypy/package.py index e830de1f3ba..f4dfe702af4 100644 --- a/var/spack/repos/builtin/packages/py-mypy/package.py +++ b/var/spack/repos/builtin/packages/py-mypy/package.py @@ -16,6 +16,8 @@ class PyMypy(PythonPackage): license("MIT AND PSF-2.0", checked_by="tgamblin") + version("1.14.1", sha256="7ec88144fe9b510e8475ec2f5f251992690fcf89ccb4500b214b4226abcd32d6") + version("1.13.0", sha256="0291a61b6fbf3e6673e3405cfcc0e7650bebc7939659fdca2702958038bd835e") version("1.11.2", sha256="7f9993ad3e0ffdc95c2a14b66dee63729f021968bff8ad911867579c65d13a79") version("1.11.1", sha256="f404a0b069709f18bbdb702eb3dcfe51910602995de00bd39cea3050b5772d08") version("1.10.1", sha256="1f8f492d7db9e3593ef42d4f115f04e556130f2819ad33ab84551403e97dd4c0") @@ -56,10 +58,8 @@ class PyMypy(PythonPackage): version("0.740", sha256="48c8bc99380575deb39f5d3400ebb6a8a1cb5cc669bbba4d3bb30f904e0a0e7d") version("0.670", sha256="e80fd6af34614a0e898a57f14296d0dacb584648f0339c2e000ddbf0f4cc2f8d") - depends_on("c", type="build") # generated - depends_on("cxx", type="build") # generated - # pyproject.toml + depends_on("py-setuptools@75.1.0:", when="@1.14:", type="build") depends_on("py-setuptools@40.6.2:", when="@0.790:", type="build") depends_on("py-setuptools", type="build") depends_on("py-wheel@0.30:", when="@0.790:", type="build") diff --git a/var/spack/repos/builtin/packages/py-radical-utils/package.py b/var/spack/repos/builtin/packages/py-radical-utils/package.py index 30f999fd1e5..207f0c20096 100644 --- a/var/spack/repos/builtin/packages/py-radical-utils/package.py +++ b/var/spack/repos/builtin/packages/py-radical-utils/package.py @@ -104,4 +104,7 @@ class PyRadicalUtils(PythonPackage): depends_on("py-pyzmq", type=("build", "run")) depends_on("py-regex", type=("build", "run")) depends_on("py-setproctitle", type=("build", "run")) - depends_on("py-setuptools", type="build") + with default_args(type="build"): + depends_on("py-setuptools") + # https://github.com/radical-cybertools/radical.utils/issues/403 + depends_on("py-setuptools@:69.2", when="@:1.51") diff --git a/var/spack/repos/builtin/packages/py-setuptools/package.py b/var/spack/repos/builtin/packages/py-setuptools/package.py index 4097f74456a..5759fe776b1 100644 --- a/var/spack/repos/builtin/packages/py-setuptools/package.py +++ b/var/spack/repos/builtin/packages/py-setuptools/package.py @@ -19,6 +19,8 @@ class PySetuptools(Package, PythonExtension): # Requires railroad skip_modules = ["setuptools._vendor", "pkg_resources._vendor"] + version("75.8.0", sha256="e3982f444617239225d675215d51f6ba05f845d4eec313da4418fdbb56fb27e3") + version("75.3.0", sha256="f2504966861356aa38616760c0f66568e535562374995367b4e69c7143cf6bcd") version("69.2.0", sha256="c21c49fb1042386df081cb5d86759792ab89efca84cf114889191cd09aacc80c") version("69.1.1", sha256="02fa291a0471b3a18b2b2481ed902af520c69e8ae0919c13da936542754b4c56") version("69.0.3", sha256="385eb4edd9c9d5c17540511303e39a147ce2fc04bc55289c322b9e5904fe2c05")