py-pytorch-lightning: add v1.6.0 (#29785)

2 files changed, 26 insertions, 12 deletions

diff --git a/var/spack/repos/builtin/packages/py-pytorch-lightning/package.py b/var/spack/repos/builtin/packages/py-pytorch-lightning/package.py
index 8c32108c76..458363faea 100644
--- a/var/spack/repos/builtin/packages/py-pytorch-lightning/package.py
+++ b/var/spack/repos/builtin/packages/py-pytorch-lightning/package.py
@@ -12,21 +12,26 @@ class PyPytorchLightning(PythonPackage):
     homepage = "https://github.com/PyTorchLightning/pytorch-lightning"
     pypi     = "pytorch-lightning/pytorch-lightning-1.2.10.tar.gz"
 
+    maintainers = ['adamjstewart']
+
+    version('1.6.0', sha256='1ab6f15750862cfbac48ad7be420050c8c353a060da7c2575f9e267158a33d42')
     version('1.5.3', sha256='a206169a0c4356366a7edadb5ebd2f38e9a611ff78265ce93b767662682f5620')
     version('1.4.1', sha256='1d1128aeb5d0e523d2204c4d9399d65c4e5f41ff0370e96d694a823af5e8e6f3')
     version('1.4.0', sha256='6529cf064f9dc323c94f3ce84b56ee1a05db1b0ab17db77c4d15aa36e34da81f')
     version('1.3.8', sha256='60b0a3e464d394864dae4c8d251afa7aa453644a19bb7672f5ee400343cdf7b0')
     version('1.2.10', sha256='2d8365e30ded0c20e73ce6e5b6028478ae460b8fd33727df2275666df005a301')
 
-    depends_on('python@3.6:', type=('build', 'run'))
+    depends_on('python@3.7:', when='@1.6:', type=('build', 'run'))
+    depends_on('python@3.6:', when='@:1.5', type=('build', 'run'))
     depends_on('py-setuptools', type='build')
     depends_on('py-numpy@1.17.2:', when='@1.3:', type=('build', 'run'))
     depends_on('py-numpy@1.16.6:', when='@:1.2', type=('build', 'run'))
-    depends_on('py-torch@1.6:', when='@1.4:', type=('build', 'run'))
+    depends_on('py-torch@1.8:', when='@1.6:', type=('build', 'run'))
+    depends_on('py-torch@1.6:', when='@1.4:1.5', type=('build', 'run'))
     depends_on('py-torch@1.4:', when='@:1.3', type=('build', 'run'))
-    depends_on('py-future@0.17.1:', type=('build', 'run'))
     depends_on('py-tqdm@4.41.0:', type=('build', 'run'))
-    depends_on('py-pyyaml@5.1:', when='@1.4:', type=('build', 'run'))
+    depends_on('py-pyyaml@5.4:', when='@1.6:', type=('build', 'run'))
+    depends_on('py-pyyaml@5.1:', when='@1.4:1.5', type=('build', 'run'))
     depends_on('py-pyyaml@5.1:5.4.1', when='@1.3', type=('build', 'run'))
     depends_on('py-pyyaml@5.1:5.3,5.5:', when='@:1.2', type=('build', 'run'))
     depends_on('py-fsspec@2021.05.0:2021.05,2021.06.1:+http', when='@1.3:', type=('build', 'run'))
@@ -34,12 +39,15 @@ class PyPytorchLightning(PythonPackage):
     depends_on('py-tensorboard@2.2.0:', when='@1.5:', type=('build', 'run'))
     depends_on('py-tensorboard@2.2.0:2.4,2.5.1:', when='@:1.4', type=('build', 'run'))
     depends_on('py-torchmetrics@0.4.1:', when='@1.5:', type=('build', 'run'))
-    depends_on('py-torchmetrics@0.4.0:', when='@1.4:', type=('build', 'run'))
+    depends_on('py-torchmetrics@0.4.0:', when='@1.4', type=('build', 'run'))
     depends_on('py-torchmetrics@0.2.0:', when='@1.3', type=('build', 'run'))
     depends_on('py-torchmetrics@0.2.0', when='@:1.2', type=('build', 'run'))
-    depends_on('py-pydeprecate@0.3.1', when='@1.4:', type=('build', 'run'))
+    depends_on('py-pydeprecate@0.3.1:0.3', when='@1.6:', type=('build', 'run'))
+    depends_on('py-pydeprecate@0.3.1', when='@1.4:1.5', type=('build', 'run'))
     depends_on('py-pydeprecate@0.3.0', when='@1.3', type=('build', 'run'))
     depends_on('py-packaging@17.0:', when='@1.3:', type=('build', 'run'))
-    depends_on('py-packaging', type=('build', 'run'))
-    depends_on('py-typing-extensions', when='@1.4:', type=('build', 'run'))
+    depends_on('py-packaging', when='@:1.2', type=('build', 'run'))
+    depends_on('py-typing-extensions@4:', when='@1.6:', type=('build', 'run'))
+    depends_on('py-typing-extensions', when='@1.4:1.5', type=('build', 'run'))
+    depends_on('py-future@0.17.1:', when='@:1.5', type=('build', 'run'))
     depends_on('pil@:8.2,8.3.1:', when='@1.3', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/py-typing-extensions/package.py b/var/spack/repos/builtin/packages/py-typing-extensions/package.py
index 1a4fa7f44a..bd4696a228 100644
--- a/var/spack/repos/builtin/packages/py-typing-extensions/package.py
+++ b/var/spack/repos/builtin/packages/py-typing-extensions/package.py
@@ -15,6 +15,7 @@ class PyTypingExtensions(PythonPackage):
     homepage = "https://github.com/python/typing/tree/master/typing_extensions"
     pypi = "typing_extensions/typing_extensions-3.7.4.tar.gz"
 
+    version('4.1.1', sha256='1a9462dcc3347a79b1f1c0271fbe79e844580bb598bafa1ed208b94da3cdcd42')
     version('3.10.0.2', sha256='49f75d16ff11f1cd258e1b988ccff82a3ca5570217d7ad8c5f48205dd99a677e')
     version('3.10.0.0', sha256='50b6f157849174217d0656f99dc82fe932884fb250826c18350e159ec6cdf342')
     version('3.7.4.3', sha256='99d4073b617d30288f569d3f13d2bd7548c3a7e4c8de87db09a9d29bb3a4a60c')
@@ -22,7 +23,12 @@ class PyTypingExtensions(PythonPackage):
     version('3.7.2', sha256='fb2cd053238d33a8ec939190f30cfd736c00653a85a2919415cecf7dc3d9da71')
     version('3.6.6', sha256='51e7b7f3dcabf9ad22eed61490f3b8d23d9922af400fe6656cb08e66656b701f')
 
-    depends_on('python@2.7:2.8,3.4:', type=('build', 'run'))
-    depends_on('py-setuptools', type='build')
-    depends_on('py-typing@3.7.4:', when='@3.7: ^python@:3.4', type=('build', 'run'))
-    depends_on('py-typing@3.6.2:', when='^python@:3.4', type=('build', 'run'))
+    # typing-extensions 4+ uses flit
+    depends_on('python@3.6:', when='@4:', type=('build', 'run'))
+    depends_on('py-flit-core@3.4:3', when='@4:', type='build')
+
+    # typing-extensions 3 uses setuptools
+    depends_on('python@2.7:2.8,3.4:', when='@:3', type=('build', 'run'))
+    depends_on('py-setuptools', when='@:3', type='build')
+    depends_on('py-typing@3.7.4:', when='@3.7:3 ^python@:3.4', type=('build', 'run'))
+    depends_on('py-typing@3.6.2:', when='@:3.6 ^python@:3.4', type=('build', 'run'))