From 4e456992e4c8abf1ca5afa35a396285cc9abb59b Mon Sep 17 00:00:00 2001
From: Manuela Kuhn <36827019+manuelakuhn@users.noreply.github.com>
Date: Thu, 6 Jul 2023 10:23:55 +0200
Subject: py-abipy: add 0.9.3 (#38716)

* py-abipy: add 0.9.3

* Remove py-cython dependency

* Remove dep version restrictions for new release
---
 .../repos/builtin/packages/py-abipy/package.py     | 55 +++++++++++++++-------
 1 file changed, 39 insertions(+), 16 deletions(-)

(limited to 'var')

diff --git a/var/spack/repos/builtin/packages/py-abipy/package.py b/var/spack/repos/builtin/packages/py-abipy/package.py
index 770c08cf42..3e868f5607 100644
--- a/var/spack/repos/builtin/packages/py-abipy/package.py
+++ b/var/spack/repos/builtin/packages/py-abipy/package.py
@@ -13,40 +13,54 @@ class PyAbipy(PythonPackage):
     homepage = "https://github.com/abinit/abipy"
     pypi = "abipy/abipy-0.2.0.tar.gz"
 
+    version("0.9.3", sha256="2f750c1ddcf78d0ec77c1bd44624ff96f80436307237589c02da127106514b75")
     version("0.2.0", sha256="c72b796ba0f9ea4299eac3085bede092d2652e9e5e8074d3badd19ef7b600792")
 
     variant("gui", default=False, description="Build the GUI")
-    variant("ipython", default=False, description="Build IPython support")
-
-    depends_on("python@2.7:")
+    variant("ipython", default=False, when="0.2.0", description="Build IPython support")
 
     depends_on("py-setuptools", type="build")
-    depends_on("py-cython", type="build")
+    # in newer pip versions --install-option does not exist
+    depends_on("py-pip@:23.0", when="+ipython", type="build")
 
-    depends_on("py-six", type=("build", "run"))
-    depends_on("py-prettytable", type=("build", "run"))
+    depends_on("py-monty", when="@0.7:", type=("build", "run"))
     depends_on("py-tabulate", type=("build", "run"))
-    depends_on("py-apscheduler@2.1.0", type=("build", "run"))
+    depends_on("py-apscheduler", when="@0.9:", type=("build", "run"))
+    depends_on("py-apscheduler@2.1.0", when="@:0.8", type=("build", "run"))
     depends_on("py-pydispatcher@2.0.5:", type=("build", "run"))
     depends_on("py-tqdm", type=("build", "run"))
-    depends_on("py-html2text", type=("build", "run"))
     depends_on("py-pyyaml@3.11:", type=("build", "run"))
     depends_on("py-pandas", type=("build", "run"))
-    depends_on("py-numpy@1.9:", type=("build", "run"))
-    depends_on("py-scipy@0.14:", type=("build", "run"))
+    depends_on("py-numpy", type=("build", "run"))
+    depends_on("py-numpy@1.9:", when="@0.2.0", type=("build", "run"))
+    depends_on("py-scipy", type=("build", "run"))
+    depends_on("py-scipy@0.14:", when="@0.2.0", type=("build", "run"))
     depends_on("py-spglib", type=("build", "run"))
+    depends_on("py-pymatgen@2022.0.14:", when="@0.9.2:", type=("build", "run"))
     depends_on("py-pymatgen@4.7.2:", type=("build", "run"))
     depends_on("py-netcdf4", type=("build", "run"))
-    depends_on("py-matplotlib@1.5:", type=("build", "run"))
+    depends_on("py-matplotlib", type=("build", "run"))
+    depends_on("py-matplotlib@1.5:", when="@0.2.0", type=("build", "run"))
     depends_on("py-seaborn", type=("build", "run"))
+    depends_on("py-plotly", when="@0.9.1:", type=("build", "run"))
+    depends_on("py-ipython", when="@0.9.1:", type=("build", "run"))
+    depends_on("py-chart-studio", when="@0.9.1:", type=("build", "run"))
+
+    with when("+gui"):
+        depends_on("py-wxpython", type=("build", "run"))
+        depends_on("py-wxmplot", type=("build", "run"))
 
-    depends_on("py-wxpython", type=("build", "run"), when="+gui")
-    depends_on("py-wxmplot", type=("build", "run"), when="+gui")
+    with when("+ipython"):
+        depends_on("py-ipython", type=("build", "run"))
+        depends_on("py-jupyter", type=("build", "run"))
+        depends_on("py-nbformat", type=("build", "run"))
 
-    depends_on("py-ipython", type=("build", "run"), when="+ipython")
-    depends_on("py-jupyter", type=("build", "run"), when="+ipython")
-    depends_on("py-nbformat", type=("build", "run"), when="+ipython")
+    # Historical dependencies
+    depends_on("py-six", when="@:0.6", type=("build", "run"))
+    depends_on("py-html2text", when="@:0.6", type=("build", "run"))
+    depends_on("py-prettytable", when="@:0.5", type=("build", "run"))
 
+    @when("0.2.0")
     def install_options(self, spec, prefix):
         args = []
 
@@ -54,3 +68,12 @@ class PyAbipy(PythonPackage):
             args.append("--with-ipython")
 
         return args
+
+    @property
+    def skip_modules(self):
+        modules = []
+
+        if self.spec.satisfies("~gui"):
+            modules.append("abipy.gui")
+
+        return modules
-- 
cgit v1.2.3-60-g2f50