py-scikit-learn: add v1.2.0 (#34408)

1 files changed, 18 insertions, 22 deletions

diff --git a/var/spack/repos/builtin/packages/py-scikit-learn/package.py b/var/spack/repos/builtin/packages/py-scikit-learn/package.py
index 771e409a6a..5a6e5516e2 100644
--- a/var/spack/repos/builtin/packages/py-scikit-learn/package.py
+++ b/var/spack/repos/builtin/packages/py-scikit-learn/package.py
@@ -16,6 +16,7 @@ class PyScikitLearn(PythonPackage):
     maintainers = ["adamjstewart"]
 
     version("master", branch="master")
+    version("1.2.0", sha256="680b65b3caee469541385d2ca5b03ff70408f6c618c583948312f0d2125df680")
     version("1.1.3", sha256="bef51978a51ec19977700fe7b86aecea49c825884f3811756b74a3b152bb4e35")
     version("1.1.2", sha256="7c22d1305b16f08d57751a4ea36071e2215efb4c09cb79183faa4e8e82a3dbf8")
     version("1.1.1", sha256="3e77b71e8e644f86c8b5be7f1c285ef597de4c384961389ee3e9ca36c445b256")
@@ -51,43 +52,38 @@ class PyScikitLearn(PythonPackage):
     variant("openmp", default=True, description="Build with OpenMP support")
 
     # setup.py
-    depends_on("python@2.6:2.8,3.3:", type=("build", "run"))
-    depends_on("python@2.7:2.8,3.4:", when="@0.20:", type=("build", "run"))
-    depends_on("python@3.5:", when="@0.21:", type=("build", "run"))
-    depends_on("python@3.6:", when="@0.23:", type=("build", "run"))
-    depends_on("python@3.7:", when="@1.0:", type=("build", "run"))
     depends_on("python@3.8:", when="@1.1:", type=("build", "run"))
 
     # pyproject.toml
-    depends_on("py-setuptools", type="build")
-    depends_on("py-setuptools@:59", when="@1.0.2:", type="build")
+    depends_on("py-setuptools@:59", type="build")
 
     # sklearn/_min_dependencies.py
-    depends_on("py-numpy@1.6.1:", when="@:0.19", type=("build", "run"))
-    depends_on("py-numpy@1.8.2:", when="@0.20", type=("build", "run"))
-    depends_on("py-numpy@1.11.0:", when="@0.21:", type=("build", "run"))
-    depends_on("py-numpy@1.13.3:", when="@0.23:", type=("build", "run"))
-    depends_on("py-numpy@1.14.6:", when="@1.0:", type=("build", "run"))
     depends_on("py-numpy@1.17.3:", when="@1.1:", type=("build", "run"))
-    depends_on("py-scipy@0.9:", when="@:0.19", type=("build", "run"))
-    depends_on("py-scipy@0.13.3:", when="@0.20", type=("build", "run"))
-    depends_on("py-scipy@0.17.0:", when="@0.21:", type=("build", "run"))
-    depends_on("py-scipy@0.19.1:", when="@0.23:", type=("build", "run"))
-    depends_on("py-scipy@1.1.0:", when="@1.0:", type=("build", "run"))
+    depends_on("py-numpy@1.14.6:", when="@1.0:", type=("build", "run"))
+    depends_on("py-numpy@1.13.3:", when="@0.23:", type=("build", "run"))
+    depends_on("py-numpy@1.11.0:", when="@0.21:", type=("build", "run"))
+    depends_on("py-numpy@1.8.2:", when="@0.20", type=("build", "run"))
+    depends_on("py-numpy@1.6.1:", when="@:0.19", type=("build", "run"))
     depends_on("py-scipy@1.3.2:", when="@1.1:", type=("build", "run"))
-    depends_on("py-joblib@0.11:", type=("build", "run"))
+    depends_on("py-scipy@1.1.0:", when="@1.0:", type=("build", "run"))
+    depends_on("py-scipy@0.19.1:", when="@0.23:", type=("build", "run"))
+    depends_on("py-scipy@0.17.0:", when="@0.21:", type=("build", "run"))
+    depends_on("py-scipy@0.13.3:", when="@0.20", type=("build", "run"))
+    depends_on("py-scipy@0.9:", when="@:0.19", type=("build", "run"))
+    depends_on("py-joblib@1.1.1:", when="@1.2:", type=("build", "run"))
     depends_on("py-joblib@1:", when="@1.1:", type=("build", "run"))
+    depends_on("py-joblib@0.11:", type=("build", "run"))
     depends_on("py-threadpoolctl@2.0.0:", when="@0.23:", type=("build", "run"))
-    depends_on("py-cython@0.23:", type="build")
-    depends_on("py-cython@0.28.5:", when="@0.21:", type="build")
     depends_on("py-cython@0.29.24:", when="@1.0.2:", type="build")
+    depends_on("py-cython@0.28.5:", when="@0.21:", type="build")
+    depends_on("py-cython@0.23:", type="build")
     depends_on("llvm-openmp", when="@0.21: %apple-clang +openmp")
 
     # Test dependencies
-    depends_on("py-matplotlib@3.1.2:", type="test")
+    depends_on("py-matplotlib@3.1.3:", type="test")
     depends_on("py-scikit-image@0.16.2:", type="test")
     depends_on("py-pandas@1.0.5:", type="test")
-    depends_on("py-pytest@5.0.1:", type="test")
+    depends_on("py-pytest@5.3.1:", type="test")
     depends_on("py-pyamg@4:", type="test")
 
     # Release tarballs are already cythonized. If you wanted to build a release