summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam J. Stewart <ajstewart426@gmail.com>2024-02-05 11:11:23 +0100
committerGitHub <noreply@github.com>2024-02-05 11:11:23 +0100
commitda36d069dbfc5d8aafb0f0ed3173d0ab67d6a5ea (patch)
tree61a838cc9069c9ae3e98b4424e8df5081f1fb5b9
parent6ff3e17a7d98ad3a141ff465644758509e6c1f7d (diff)
downloadspack-da36d069dbfc5d8aafb0f0ed3173d0ab67d6a5ea.tar.gz
spack-da36d069dbfc5d8aafb0f0ed3173d0ab67d6a5ea.tar.bz2
spack-da36d069dbfc5d8aafb0f0ed3173d0ab67d6a5ea.tar.xz
spack-da36d069dbfc5d8aafb0f0ed3173d0ab67d6a5ea.zip
py-lightly: fix conflict definition (#42449)
-rw-r--r--var/spack/repos/builtin/packages/py-lightly/package.py3
1 files changed, 1 insertions, 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")