From 36caa6158a18ec9d27c2cbe05945718651593a36 Mon Sep 17 00:00:00 2001 From: Robert Maaskant Date: Wed, 23 Apr 2025 19:04:46 +0200 Subject: [PATCH] py-flit and py-flit-core: add v3.10.0 -> v3.12.0 (#50139) * py-flit: add v3.10.0 and v3.10.1 * fixup! py-flit: add v3.10.0 and v3.10.1 * py-flit and py-flit-core: add v3.11.0 * py-flit and py-flit-core: add v3.12.0 * py-flit: some deps are runtime only * py-flit-core: fix python dep for v3.12.0 * py-flit-core: correct versions for python dep --- .../builtin/packages/py-flit-core/package.py | 7 ++++ .../repos/builtin/packages/py-flit/package.py | 39 +++++++++++++------ 2 files changed, 35 insertions(+), 11 deletions(-) diff --git a/var/spack/repos/builtin/packages/py-flit-core/package.py b/var/spack/repos/builtin/packages/py-flit-core/package.py index f77761a91f2..56e228b6388 100644 --- a/var/spack/repos/builtin/packages/py-flit-core/package.py +++ b/var/spack/repos/builtin/packages/py-flit-core/package.py @@ -19,6 +19,8 @@ class PyFlitCore(PythonPackage): license("BSD-3-Clause") + version("3.12.0", sha256="18f63100d6f94385c6ed57a72073443e1a71a4acb4339491615d0f16d6ff01b2") + version("3.11.0", sha256="6ceeee3219e9d2ea282041f3e027c441597b450b33007cb81168e887b6113a8f") version("3.10.1", sha256="66e5b87874a0d6e39691f0e22f09306736b633548670ad3c09ec9db03c5662f7") version("3.9.0", sha256="72ad266176c4a3fcfab5f2930d76896059851240570ce9a98733b658cb786eba") version("3.8.0", sha256="b305b30c99526df5e63d6022dd2310a0a941a187bd3884f4c8ef0418df6c39f3") @@ -33,6 +35,11 @@ class PyFlitCore(PythonPackage): version("3.0.0", sha256="a465052057e2d6d957e6850e9915245adedfc4fd0dd5737d0791bf3132417c2d") version("2.3.0", sha256="a50bcd8bf5785e3a7d95434244f30ba693e794c5204ac1ee908fc07c4acdbf80") + with default_args(type=("build", "run")): + depends_on("python@3.6:", when="@3.4:") + depends_on("python@3.4:", when="@3.0:") + depends_on("python@2.7,3.4:", when="@2.3:") + # flit_core/build_thyself.py depends_on("py-tomli", when="@3.4:3.5", type="run") depends_on("py-toml", when="@3.1:3.3", type="run") diff --git a/var/spack/repos/builtin/packages/py-flit/package.py b/var/spack/repos/builtin/packages/py-flit/package.py index f30b409be0c..5200596053d 100644 --- a/var/spack/repos/builtin/packages/py-flit/package.py +++ b/var/spack/repos/builtin/packages/py-flit/package.py @@ -14,20 +14,37 @@ class PyFlit(PythonPackage): license("BSD-3-Clause") + version("3.12.0", sha256="1c80f34dd96992e7758b40423d2809f48f640ca285d0b7821825e50745ec3740") + version("3.11.0", sha256="58d0a07f684c315700c9c54a661a1130995798c3e495db0db53ce6e7d0121825") + version("3.10.1", sha256="9c6258ae76d218ce60f9e39a43ca42006a3abcc5c44ea6bb2a1daa13857a8f1a") + version("3.10.0", sha256="dadca58d5097db62884d25d70b572f104954927daadc8cee449739215b7237fd") version("3.9.0", sha256="d75edf5eb324da20d53570a6a6f87f51e606eee8384925cd66a90611140844c7") version("3.8.0", sha256="d0f2a8f4bd45dc794befbf5839ecc0fd3830d65a57bd52b5997542fac5d5e937") version("3.7.1", sha256="3c9bd9c140515bfe62dd938c6610d10d6efb9e35cc647fc614fe5fb3a5036682") version("3.6.0", sha256="b1464e006df4df4c8eeb37671c0e0ce66e1d04e4a36d91b702f180a25fde3c11") version("3.3.0", sha256="65fbe22aaa7f880b776b20814bd80b0afbf91d1f95b17235b608aa256325ce57") - depends_on("python@3.6:", type=("build", "run")) - depends_on("py-flit-core@3.9.0:3", when="@3.9.0:3", type=("build", "run")) - depends_on("py-flit-core@3.8.0:3", when="@3.8.0:3.8", type=("build", "run")) - depends_on("py-flit-core@3.7.1:3", when="@3.7.1:3.7", type=("build", "run")) - depends_on("py-flit-core@3.6.0:3", when="@3.6.0:3.6", type=("build", "run")) - depends_on("py-flit-core@3.3.0:3", when="@3.3.0:3.3", type=("build", "run")) - depends_on("py-requests", type=("build", "run")) - depends_on("py-docutils", type=("build", "run")) - depends_on("py-tomli", when="@3.4:3.7", type=("build", "run")) - depends_on("py-tomli-w", when="@3.4:", type=("build", "run")) - depends_on("py-toml", when="@3.3.0:3.3", type=("build", "run")) + with default_args(type=("build", "run")): + depends_on("python@3.8:", when="@3.10:") + depends_on("python@3.6:") + + depends_on("py-flit-core@3.12.0:3", when="@3.12.0:3") + depends_on("py-flit-core@3.11.0:3", when="@3.11.0:3") + depends_on("py-flit-core@3.10.1:3", when="@3.10.1:3") + depends_on("py-flit-core@3.10.0:3", when="@3.10.0:3") + depends_on("py-flit-core@3.9.0:3", when="@3.9.0:3") + depends_on("py-flit-core@3.8.0:3", when="@3.8.0:3.8") + depends_on("py-flit-core@3.7.1:3", when="@3.7.1:3.7") + depends_on("py-flit-core@3.6.0:3", when="@3.6.0:3.6") + depends_on("py-flit-core@3.3.0:3", when="@3.3.0:3.3") + + with default_args(type=("run")): + depends_on("py-pip", when="@3.10:") + + depends_on("py-requests") + + depends_on("py-docutils") + + depends_on("py-tomli", when="@3.4:3.7") + depends_on("py-tomli-w", when="@3.4:") + depends_on("py-toml", when="@3.3.0:3.3")