From da36d069dbfc5d8aafb0f0ed3173d0ab67d6a5ea Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Mon, 5 Feb 2024 11:11:23 +0100 Subject: py-lightly: fix conflict definition (#42449) --- var/spack/repos/builtin/packages/py-lightly/package.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/var/spack/repos/builtin/packages/py-lightly/package.py b/var/spack/repos/builtin/packages/py-lightly/package.py index f9dff99f4f..31e25d03df 100644 --- a/var/spack/repos/builtin/packages/py-lightly/package.py +++ b/var/spack/repos/builtin/packages/py-lightly/package.py @@ -68,5 +68,4 @@ class PyLightly(PythonPackage): depends_on("py-torch+distributed", when="@:1.4.4", type=("build", "run")) # https://github.com/microsoft/torchgeo/issues/1824 - # FIXME: this conflict doesn't actually work because lightly does not have a dep on timm - conflicts("^py-timm@:0.9.8", when="@1.4.26") + conflicts("py-timm@:0.9.8", when="@1.4.26") -- cgit v1.2.3-70-g09d2