py-mne: add 1.4.0 and py-importlib-resources: add 5.12.0 (#37624)

* py-mne: add 1.4.0 and py-importlib-resources: add 5.12.0

* Fix style

* Update var/spack/repos/builtin/packages/py-mne/package.py

Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>

---------

Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>

2 files changed, 13 insertions, 8 deletions

diff --git a/var/spack/repos/builtin/packages/py-importlib-resources/package.py b/var/spack/repos/builtin/packages/py-importlib-resources/package.py
index 89bbeaac1b..e6c1b4130d 100644
--- a/var/spack/repos/builtin/packages/py-importlib-resources/package.py
+++ b/var/spack/repos/builtin/packages/py-importlib-resources/package.py
@@ -12,6 +12,7 @@ class PyImportlibResources(PythonPackage):
     homepage = "https://github.com/python/importlib_resources"
     pypi = "importlib_resources/importlib_resources-1.0.2.tar.gz"
 
+    version("5.12.0", sha256="4be82589bf5c1d7999aedf2a45159d10cb3ca4f19b2271f8792bc8e6da7b22f6")
     version("5.9.0", sha256="5481e97fb45af8dcf2f798952625591c58fe599d0735d86b10f54de086a61681")
     version("5.3.0", sha256="f2e58e721b505a79abe67f5868d99f8886aec8594c962c7490d0c22925f518da")
     version("5.2.3", sha256="203d70dda34cfbfbb42324a8d4211196e7d3e858de21a5eb68c6d1cdd99e4e98")
@@ -19,12 +20,9 @@ class PyImportlibResources(PythonPackage):
     version("5.1.0", sha256="bfdad047bce441405a49cf8eb48ddce5e56c696e185f59147a8b79e75e9e6380")
     version("1.0.2", sha256="d3279fd0f6f847cced9f7acc19bd3e5df54d34f93a2e7bb5f238f81545787078")
 
-    depends_on("python@2.7:2.8,3.4:", type=("build", "run"))
-    depends_on("python@3.6:", when="@5:", type=("build", "run"))
-    depends_on("python@3.7:", when="@5.9.0:", type=("build", "run"))
-
-    depends_on("py-setuptools", type="build")
     depends_on("py-setuptools@56:", when="@5.9.0:", type="build")
+    depends_on("py-setuptools", type="build")
     depends_on("py-setuptools-scm@3.4.1:+toml", when="@5:", type="build")
-    depends_on("py-zipp@0.4:", when="@5.0:5.1", type=("build", "run"))
+
     depends_on("py-zipp@3.1.0:", when="@5.2.2: ^python@:3.9", type=("build", "run"))
+    depends_on("py-zipp@0.4:", when="@5.0:5.1", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-mne/package.py b/var/spack/repos/builtin/packages/py-mne/package.py
index 159f791fca..1108fde7bb 100644
--- a/var/spack/repos/builtin/packages/py-mne/package.py
+++ b/var/spack/repos/builtin/packages/py-mne/package.py
@@ -13,6 +13,7 @@ class PyMne(PythonPackage):
     pypi = "mne/mne-0.23.4.tar.gz"
     git = "https://github.com/mne-tools/mne-python.git"
 
+    version("1.4.0", sha256="7834f5b79c2c9885ca601bbddd8db3c2b2f37c34443fc0caf0447751f6c37a2a")
     version("1.3.1", sha256="0d0626d3187dd0ee6f8740d054660a1b5fce4c879f814b745b13c5a587baf32b")
     version("1.2.3", sha256="b300dcee69ffb878cdbc5c02490e877df385c1b9482622e3aa1da06a604a6e37")
     version("1.2.2", sha256="d40743d6ca7ae3919a557166fd5fc4c00a9719e40c07346baad57964e15f02bb")
@@ -20,25 +21,31 @@ class PyMne(PythonPackage):
     version("0.18.2", sha256="aa2e72ad3225efdad39b05e67cd5c88dbd5c3fabf5e1705e459347131f114bc6")
 
     # don't support full variant for newer versions (for now) because dependencies get out of hand
-    variant("full", default=False, when="@:23", description="Enable full functionality.")
+    variant("full", default=False, when="@:0.23", description="Enable full functionality.")
     variant("hdf5", default=False, when="@1:", description="Enable hdf5 functionality.")
 
-    depends_on("python@3.7:", when="@0.24:", type=("build", "run"))
+    depends_on("python@3.8:", when="@1.4:", type=("build", "run"))
+    depends_on("py-setuptools@45:", when="@1.4:", type="build")
     depends_on("py-setuptools", type="build")
+    depends_on("py-setuptools-scm@6.2:", when="@1.4:", type="build")
 
     # requirements_base.txt with versions specified in README.rst (marked with *)
+    depends_on("py-numpy@1.20.2:", when="@1.4:", type=("build", "run"))  # *
     depends_on("py-numpy@1.18.1:", when="@1:", type=("build", "run"))  # *
     depends_on("py-numpy@1.15.4:", when="@0.23:", type=("build", "run"))
     depends_on("py-numpy@1.11.3:", type=("build", "run"))
+    depends_on("py-scipy@1.6.3:", when="@1.4:", type=("build", "run"))
     depends_on("py-scipy@1.4.1:", when="@1:", type=("build", "run"))  # *
     depends_on("py-scipy@1.1.0:", when="@0.23:", type=("build", "run"))
     depends_on("py-scipy@0.17.1:", type=("build", "run"))
+    depends_on("py-matplotlib@3.4:", when="@1:", type=("build", "run"))  # *
     depends_on("py-matplotlib@3.1:", when="@1:", type=("build", "run"))  # *
     depends_on("py-tqdm", when="@1:", type=("build", "run"))
     depends_on("py-pooch@1.5:", when="@1:", type=("build", "run"))
     depends_on("py-decorator", when="@1:", type=("build", "run"))
     depends_on("py-packaging", when="@1:", type=("build", "run"))
     depends_on("py-jinja2", when="@1:", type=("build", "run"))
+    depends_on("py-importlib-resources@5.10.2:", when="@1.4: ^python@:3.8", type=("build", "run"))
 
     with when("+hdf5"):
         depends_on("py-h5io", type=("build", "run"))