Updating torchgeo to 0.4.1 (#36793)

* Updating torchgeo to 0.4.1

* Added some commas

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

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

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

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

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

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

* Changed fiona bounds

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

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

---------

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

1 files changed, 30 insertions, 16 deletions

diff --git a/var/spack/repos/builtin/packages/py-torchgeo/package.py b/var/spack/repos/builtin/packages/py-torchgeo/package.py
index 445b9d4698..d67c928b09 100644
--- a/var/spack/repos/builtin/packages/py-torchgeo/package.py
+++ b/var/spack/repos/builtin/packages/py-torchgeo/package.py
@@ -20,6 +20,7 @@ class PyTorchgeo(PythonPackage):
     maintainers("adamjstewart", "calebrob6")
 
     version("main", branch="main")
+    version("0.4.1", sha256="a3692436bf63df8d2f9b76d16eea5ee309dd1bd74e0fde6e64456abfdb2a5b58")
     version("0.4.0", sha256="a0812487205aa2db7bc92119d896ae4bf4f1014e6fdc0ce0f75bcb24fada6613")
     version("0.3.1", sha256="ba7a716843575d173abab383c6cc2d5fc8faf5834472f16a4abe1b932040ece5")
     version("0.3.0", sha256="3d98fd58e6678555592a596bd079ed5a8b4959996ff7718d7caa48d47815b6b0")
@@ -36,26 +37,27 @@ class PyTorchgeo(PythonPackage):
     # Required dependencies
     depends_on("python@3.7:3+bz2", when="@0.3:", type=("build", "run"))
     depends_on("python@3.6:3+bz2", when="@:0.2", type=("build", "run"))
-    depends_on("py-setuptools@42:66", when="@0.4:", type="build")
+    depends_on("py-setuptools@42:67", when="@0.4.1:", type="build")
+    depends_on("py-setuptools@42:66", when="@0.4.0", type="build")
     depends_on("py-setuptools@42:65", when="@0.3.1", type="build")
     depends_on("py-setuptools@42:63", when="@:0.3.0", type="build")
     depends_on("py-einops@0.3:0.6", when="@0.4:", type=("build", "run"))
     depends_on("py-einops@0.3:0.4", when="@:0.3", type=("build", "run"))
-    depends_on("py-fiona@1.8:2", when="@0.4:", type=("build", "run"))
-    depends_on("py-fiona@1.8:1", when="@0.3", type=("build", "run"))
+    depends_on("py-fiona@1.8:1", when="@0.3:", type=("build", "run"))
     depends_on("py-fiona@1.5:1", when="@:0.2", type=("build", "run"))
     depends_on("py-kornia@0.6.5:0.6", when="@0.4.1:", type=("build", "run"))
     depends_on("py-kornia@0.6.5:0.6.9", when="@0.4.0", type=("build", "run"))
     depends_on("py-kornia@0.6.4:0.6.9", when="@0.3", type=("build", "run"))
     depends_on("py-kornia@0.5.11:0.6.9", when="@0.2", type=("build", "run"))
     depends_on("py-kornia@0.5.4:0.6.9", when="@0.1", type=("build", "run"))
+    depends_on("py-lightning@1.8:1", when="@0.4.1:", type=("build", "run"))
     depends_on("py-matplotlib@3.3:3", type=("build", "run"))
     depends_on("py-numpy@1.17.2:1", type=("build", "run"))
-    depends_on("py-omegaconf@2.1:2", type=("build", "run"))
+    depends_on("py-omegaconf@2.1:2", when="@:0.4.0", type=("build", "run"))
     depends_on("py-packaging@17:21", when="@0.3", type=("build", "run"))
     depends_on("pil@6.2:9+zlib+jpeg+tiff", type=("build", "run"))
     depends_on("py-pyproj@2.2:3", type=("build", "run"))
-    depends_on("py-pytorch-lightning@1.5.1:1+extra", when="@0.4:", type=("build", "run"))
+    depends_on("py-pytorch-lightning@1.5.1:1", when="@0.4.0", type=("build", "run"))
     depends_on("py-pytorch-lightning@1.5.1:1", when="@0.3.1", type=("build", "run"))
     depends_on("py-pytorch-lightning@1.5.1:1.8", when="@0.3.0", type=("build", "run"))
     depends_on("py-pytorch-lightning@1.3:1.8", when="@:0.2", type=("build", "run"))
@@ -72,14 +74,16 @@ class PyTorchgeo(PythonPackage):
     depends_on("py-shapely@1.3:1", when="@:0.3", type=("build", "run"))
     depends_on("py-timm@0.4.12:0.6", when="@0.4:", type=("build", "run"))
     depends_on("py-timm@0.4.12:0.4", when="@:0.3", type=("build", "run"))
-    depends_on("py-torch@1.12:1", when="@0.4:", type=("build", "run"))
+    depends_on("py-torch@1.12:2", when="@0.4.1:", type=("build", "run"))
+    depends_on("py-torch@1.12:1", when="@0.4.0", type=("build", "run"))
     depends_on("py-torch@1.9:1", when="@0.2:0.3", type=("build", "run"))
     depends_on("py-torch@1.7:1", when="@0.1", type=("build", "run"))
     depends_on("py-torchmetrics@0.10:0.11", when="@0.4:", type=("build", "run"))
     depends_on("py-torchmetrics@0.7:0.9", when="@0.3", type=("build", "run"))
     depends_on("py-torchmetrics@0.7:0.8", when="@0.2.1", type=("build", "run"))
     depends_on("py-torchmetrics@0.7", when="@:0.2.0", type=("build", "run"))
-    depends_on("py-torchvision@0.13:0.14", when="@0.4:", type=("build", "run"))
+    depends_on("py-torchvision@0.13:0.15", when="@0.4.1:", type=("build", "run"))
+    depends_on("py-torchvision@0.13:0.14", when="@0.4.0", type=("build", "run"))
     depends_on("py-torchvision@0.10:0.13", when="@0.3", type=("build", "run"))
     depends_on("py-torchvision@0.10:0.12", when="@0.2", type=("build", "run"))
     depends_on("py-torchvision@0.3:0.12", when="@0.1", type=("build", "run"))
@@ -92,12 +96,17 @@ class PyTorchgeo(PythonPackage):
         depends_on("libtiff+jpeg+zlib", type="run")
         depends_on("open3d@0.11.2:0.14+python", when="@0.2:0.3", type="run")
         depends_on("opencv@3.4.2.17:4+python3+imgcodecs+tiff+jpeg+png", type="run")
-        depends_on("py-pandas@0.23.2:1", when="@0.3:", type="run")
+        depends_on("py-pandas@0.23.2:2", when="@0.4.1:", type="run")
+        depends_on("py-pandas@0.23.2:1", when="@0.3:0.4.0", type="run")
         depends_on("py-pandas@0.19.1:1", when="@0.2", type="run")
         depends_on("py-pycocotools@2", type="run")
-        depends_on("py-pyvista@0.20:0.37", when="@0.4:", type="run")
-        depends_on("py-radiant-mlhub@0.2.1:0.4", type="run")
+        depends_on("py-pyvista@0.20:0.38", when="@0.4.1:", type="run")
+        depends_on("py-pyvista@0.20:0.37", when="@0.4.0", type="run")
+        depends_on("py-radiant-mlhub@0.3:0.5", when="@0.4.1:", type="run")
+        depends_on("py-radiant-mlhub@0.2.1:0.4", when="@:0.4.0", type="run")
         depends_on("py-rarfile@3:4", type="run")
+        depends_on("py-scikit-image@0.18:0.20", when="@0.4.1:", type="run")
+        depends_on("py-scikit-image@0.18:0.19", when="@0.4.0", type="run")
         depends_on("py-scipy@1.6.2:1", when="@0.4:", type="run")
         depends_on("py-scipy@1.2:1", when="@0.3", type="run")
         depends_on("py-scipy@0.9:1", when="@:0.2", type="run")
@@ -106,13 +115,14 @@ class PyTorchgeo(PythonPackage):
     with when("+docs"):
         depends_on("py-ipywidgets@7:8", when="@0.3.1:", type="run")
         depends_on("py-ipywidgets@7", when="@:0.3.0", type="run")
-        depends_on("py-nbsphinx@0.8.5:0.8", type="run")
+        depends_on("py-nbsphinx@0.8.5:0.9", when="@0.4.1:", type="run")
+        depends_on("py-nbsphinx@0.8.5:0.8", when="@:0.4.0", type="run")
         depends_on("py-pytorch-sphinx-theme", type="run")
-        depends_on("py-sphinx@4:6", when="@0.4:", type="run")
-        depends_on("py-sphinx@4:5", when="@:0.3", type="run")
+        depends_on("py-sphinx@4:5", type="run")
 
     with when("+style"):
-        depends_on("py-black@21.8:22+jupyter", when="@0.3:", type="run")
+        depends_on("py-black@21.8:23+jupyter", when="@0.4.1:", type="run")
+        depends_on("py-black@21.8:22+jupyter", when="@0.3:0.4.0", type="run")
         depends_on("py-black@21:22", when="@:0.2", type="run")
         depends_on("py-flake8@3.8:6", when="@0.4:", type="run")
         depends_on("py-flake8@3.8:5", when="@0.3.1", type="run")
@@ -123,11 +133,15 @@ class PyTorchgeo(PythonPackage):
         depends_on("py-pyupgrade@1.24:2", when="@0.3", type="run")
 
     with when("+tests"):
-        depends_on("py-mypy@0.900:0.991", when="@0.4:", type="run")
+        depends_on("py-mypy@0.900:1", when="@0.4.1:", type="run")
+        depends_on("py-mypy@0.900:0.991", when="@0.4.0", type="run")
         depends_on("py-mypy@0.900:0.971", when="@0.3.1", type="run")
         depends_on("py-mypy@0.900:0.961", when="@:0.3.0", type="run")
-        depends_on("py-nbmake@0.1:1", when="@0.3.1:", type="run")
+        depends_on("py-nbmake@1.3.3:1", when="@0.4.1:", type="run")
+        depends_on("py-nbmake@0.1:1", when="@0.3.1:0.4.0", type="run")
         depends_on("py-nbmake@0.1:1.1", when="@:0.3.0", type="run")
+        depends_on("py-omegaconf@2.1:2", when="@0.4.1:", type="run")
         depends_on("py-pytest@6.1.2:7", type="run")
         depends_on("py-pytest-cov@2.4:4", when="@0.4:", type="run")
         depends_on("py-pytest-cov@2.4:3", when="@:0.3", type="run")
+        depends_on("py-tensorboard@2.9.1:2", when="@0.4.1:", type="run")