From e8c06e3d25a010cb1eda4cfbefb101e7a4aae30e Mon Sep 17 00:00:00 2001
From: Abolfazl Ziaeemehr <a.ziaeemehr@gmail.com>
Date: Fri, 7 Mar 2025 15:12:23 +0100
Subject: [PATCH 1/6] fix(py-vbi): update version hash for 0.1.3
---
packages/py-vbi/package.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/packages/py-vbi/package.py b/packages/py-vbi/package.py
index 138893c5..54015c6d 100644
--- a/packages/py-vbi/package.py
+++ b/packages/py-vbi/package.py
@@ -12,8 +12,9 @@ class PyVbi(PythonPackage):
git = "https://github.com/ins-amu/vbi"
url = "https://github.com/ins-amu/vbi/archive/refs/tags/v0.1.3.tar.gz"
- version("0.1.3", "54fa2062f44c9ec8219fae3c13c52a4bd17141b5467b982987673de0662c5255")
+ version("0.1.3", "d1b9840e8e570adb8eb90d7e8c110a2659aa81d78ac479b8a77b2054eb3d4c1a")
version("0.1.2", "6ccfeeec718be62a480002a8370130a3e3344955186f99ecbb15b646b68210d6")
+
patch('fix-install.patch')
--
GitLab
From aed29b42d1f36eb1042fbd7ea9b65dfd704c361a Mon Sep 17 00:00:00 2001
From: Abolfazl Ziaeemehr <a.ziaeemehr@gmail.com>
Date: Fri, 7 Mar 2025 15:46:07 +0100
Subject: [PATCH 2/6] fix(py-vbi): remove obsolete installation patch
---
packages/py-vbi/fix-install.patch | 12 ------------
packages/py-vbi/package.py | 1 -
2 files changed, 13 deletions(-)
delete mode 100644 packages/py-vbi/fix-install.patch
diff --git a/packages/py-vbi/fix-install.patch b/packages/py-vbi/fix-install.patch
deleted file mode 100644
index d84cceb0..00000000
--- a/packages/py-vbi/fix-install.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/pyproject.toml b/pyproject.toml
-index debc24e..2e0500b 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -58,7 +58,6 @@ path = "vbi/_version.py"
-
-
- [tool.setuptools]
--packages = ["vbi"]
- include-package-data = true
-
- [tool.setuptools.package-data]
diff --git a/packages/py-vbi/package.py b/packages/py-vbi/package.py
index 54015c6d..af911dd3 100644
--- a/packages/py-vbi/package.py
+++ b/packages/py-vbi/package.py
@@ -16,7 +16,6 @@ class PyVbi(PythonPackage):
version("0.1.2", "6ccfeeec718be62a480002a8370130a3e3344955186f99ecbb15b646b68210d6")
- patch('fix-install.patch')
depends_on("python@3.8:", type=("build","run"))
depends_on("py-setuptools", type="build")
--
GitLab
From 53a1909fa71735ac385bf7d5966b5f20a5833da2 Mon Sep 17 00:00:00 2001
From: Abolfazl Ziaeemehr <a.ziaeemehr@gmail.com>
Date: Fri, 7 Mar 2025 15:56:05 +0100
Subject: [PATCH 3/6] feat(py-vbi): add dependency on py-cupy for build and run
---
packages/py-vbi/package.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/packages/py-vbi/package.py b/packages/py-vbi/package.py
index af911dd3..8fa04f67 100644
--- a/packages/py-vbi/package.py
+++ b/packages/py-vbi/package.py
@@ -37,6 +37,7 @@ class PyVbi(PythonPackage):
depends_on("py-scikit-learn", type=("build", "run"))
depends_on("py-pycatch22", type=("build", "run"))
depends_on("py-pytest", type="test")
+ depends_on("py-cupy", type=("build", "run"))
@run_after("install")
@on_package_attributes(run_tests=True)
--
GitLab
From 4c92b116edda6fb391c61e2434e9467bcce8f16d Mon Sep 17 00:00:00 2001
From: Abolfazl Ziaeemehr <abolfazl.ziaee-mehr@univ-amu.fr>
Date: Fri, 7 Mar 2025 16:08:00 +0100
Subject: [PATCH 4/6] Apply 1 suggestion(s) to 1 file(s)
Co-authored-by: Eleni Mathioulaki <emathioulaki@athenarc.gr>
---
packages/py-vbi/package.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/packages/py-vbi/package.py b/packages/py-vbi/package.py
index 8fa04f67..10f03901 100644
--- a/packages/py-vbi/package.py
+++ b/packages/py-vbi/package.py
@@ -6,7 +6,7 @@
from spack import *
-class PyVbi(PythonPackage):
+class PyVbi(PythonPackage, CudaPackage):
homepage = "https://vbi.readthedocs.io/latest/"
git = "https://github.com/ins-amu/vbi"
--
GitLab
From e10d43a2ad5c9e44075fd4ec39a6ae7482d8fbb3 Mon Sep 17 00:00:00 2001
From: Abolfazl Ziaeemehr <abolfazl.ziaee-mehr@univ-amu.fr>
Date: Fri, 7 Mar 2025 16:08:06 +0100
Subject: [PATCH 5/6] Apply 1 suggestion(s) to 1 file(s)
Co-authored-by: Eleni Mathioulaki <emathioulaki@athenarc.gr>
---
packages/py-vbi/package.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/packages/py-vbi/package.py b/packages/py-vbi/package.py
index 10f03901..4b3d7a70 100644
--- a/packages/py-vbi/package.py
+++ b/packages/py-vbi/package.py
@@ -37,7 +37,7 @@ class PyVbi(PythonPackage, CudaPackage):
depends_on("py-scikit-learn", type=("build", "run"))
depends_on("py-pycatch22", type=("build", "run"))
depends_on("py-pytest", type="test")
- depends_on("py-cupy", type=("build", "run"))
+ depends_on("py-cupy", type=("build", "run"), when="+cuda")
@run_after("install")
@on_package_attributes(run_tests=True)
--
GitLab
From 99a7e236be8a1e6ef2977392e2814f0471ac2908 Mon Sep 17 00:00:00 2001
From: Abolfazl Ziaeemehr <a.ziaeemehr@gmail.com>
Date: Fri, 7 Mar 2025 17:39:04 +0100
Subject: [PATCH 6/6] update vbi for v0.1.3
---
packages/py-vbi/package.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/packages/py-vbi/package.py b/packages/py-vbi/package.py
index 8fa04f67..601c9bde 100644
--- a/packages/py-vbi/package.py
+++ b/packages/py-vbi/package.py
@@ -12,7 +12,7 @@ class PyVbi(PythonPackage):
git = "https://github.com/ins-amu/vbi"
url = "https://github.com/ins-amu/vbi/archive/refs/tags/v0.1.3.tar.gz"
- version("0.1.3", "d1b9840e8e570adb8eb90d7e8c110a2659aa81d78ac479b8a77b2054eb3d4c1a")
+ version("0.1.3", "8ccccf2bf0def2bf97f4706b8597c4cb3ac5f0cf2ac5f08566e22cd6273c1163")
version("0.1.2", "6ccfeeec718be62a480002a8370130a3e3344955186f99ecbb15b646b68210d6")
--
GitLab