py-torchgeo: add v0.6.0 (#46158)

2 files changed, 162 insertions, 128 deletions

diff --git a/var/spack/repos/builtin/packages/py-pycocotools/package.py b/var/spack/repos/builtin/packages/py-pycocotools/package.py
index 46117215fa..f082d4bcbf 100644
--- a/var/spack/repos/builtin/packages/py-pycocotools/package.py
+++ b/var/spack/repos/builtin/packages/py-pycocotools/package.py
@@ -12,12 +12,14 @@ class PyPycocotools(PythonPackage):
     homepage = "https://github.com/cocodataset/cocoapi"
     pypi = "pycocotools/pycocotools-2.0.2.tar.gz"
 
+    version("2.0.8", sha256="8f2bcedb786ba26c367a3680f9c4eb5b2ad9dccb2b34eaeb205e0a021e1dfb8d")
     version("2.0.6", sha256="7fe089b05cc18e806dcf3bd764708d86dab922a100f3734eb77fb77a70a1d18c")
     version("2.0.2", sha256="24717a12799b4471c2e54aa210d642e6cd4028826a1d49fcc2b0e3497e041f1a")
 
-    depends_on("c", type="build")  # generated
-    depends_on("cxx", type="build")  # generated
+    depends_on("c", type="build")
+    depends_on("cxx", type="build")
 
+    depends_on("python@3.9:", when="@2.0.8:", type=("build", "link", "run"))
     depends_on("python", type=("build", "link", "run"))
     depends_on("py-cython@0.27.3:", when="@2.0.4:", type="build")
     depends_on("py-cython@0.27.3:", when="@:2.0.3", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-torchgeo/package.py b/var/spack/repos/builtin/packages/py-torchgeo/package.py
index 4091264314..b5bf08f9c4 100644
--- a/var/spack/repos/builtin/packages/py-torchgeo/package.py
+++ b/var/spack/repos/builtin/packages/py-torchgeo/package.py
@@ -13,11 +13,11 @@ class PyTorchgeo(PythonPackage):
     pypi = "torchgeo/torchgeo-0.1.0.tar.gz"
     git = "https://github.com/microsoft/torchgeo.git"
 
-    maintainers("adamjstewart", "calebrob6")
-
     license("MIT")
+    maintainers("adamjstewart", "calebrob6")
 
     version("main", branch="main")
+    version("0.6.0", sha256="c5b073b3c9ac06cd68e45620bab3a78fb7637fa3563aae4f75f4781ba57aee5a")
     version("0.5.2", sha256="b23df51fe53ebe66c8d555484605a5618985f3680b70275f99ce8665e7203560")
     version("0.5.1", sha256="5f86a34d18fe36eeb9146b057b21e5356252ef8ab6a9db33feebb120a01feff8")
     version("0.5.0", sha256="2bc2f9c4a19a569790cb3396499fdec17496632b0e52b86be390a2cc7a1a7033")
@@ -36,139 +36,171 @@ class PyTorchgeo(PythonPackage):
     variant("tests", default=False, description="Install testing tools")
 
     # NOTE: historically, dependencies had upper bounds based on semantic version compatibility.
-    # However, these were removed to improve maintainability and flexibility of the recipe.
+    # However, these were removed to improve the maintainability and flexibility of the recipe.
 
     # Required dependencies
-    depends_on("python@3.9:", when="@0.5:", type=("build", "run"))
-    # COWC dataset requires unpacking .bz2 files.
-    depends_on("python+bz2", type=("build", "run"))
-    depends_on("py-setuptools@61:", when="@0.5:", type="build")
-    depends_on("py-setuptools@42:", type="build")
-    depends_on("py-einops@0.3:", type=("build", "run"))
-    depends_on("py-fiona@1.8.19:", when="@0.5:", type=("build", "run"))
-    depends_on("py-fiona@1.8:", when="@0.3:", type=("build", "run"))
-    depends_on("py-fiona@1.5:", type=("build", "run"))
-    # Only part of lightning[pytorch-extra] we actually require.
-    depends_on("py-jsonargparse@4.26.1:+signatures", when="@0.5:", type=("build", "run"))
-    depends_on("py-kornia@0.6.9:", when="@0.5:", type=("build", "run"))
-    depends_on("py-kornia@0.6.5:", when="@0.4.1:", type=("build", "run"))
-    # https://github.com/microsoft/torchgeo/pull/1123
-    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-lightly@1.4.4:", when="@0.5:", type=("build", "run"))
-    depends_on("py-lightning@2:", when="@0.5:", type=("build", "run"))
-    depends_on("py-lightning@1.8:", when="@0.4.1:", type=("build", "run"))
-    depends_on("py-matplotlib@3.3.3:", when="@0.5:", type=("build", "run"))
-    depends_on("py-matplotlib@3.3:", type=("build", "run"))
-    depends_on("py-numpy@1.19.3:", when="@0.5:", type=("build", "run"))
-    depends_on("py-numpy@1.17.2:", type=("build", "run"))
-    # https://github.com/microsoft/torchgeo/pull/2151
-    depends_on("py-numpy@:1", when="@:0.5", type=("build", "run"))
-    depends_on("py-pandas@1.1.3:", when="@0.5:", type=("build", "run"))
-    depends_on("pil@8:", when="@0.5:", type=("build", "run"))
-    depends_on("pil@6.2:", type=("build", "run"))
-    # JPEG, TIFF, and compressed PNG support required for file I/O in several datasets.
-    depends_on(
-        "py-pillow +jpeg+tiff+zlib", type=("build", "run"), when="^[virtuals=pil] py-pillow"
-    )
-    depends_on(
-        "py-pillow-simd +jpeg+tiff+zlib",
-        type=("build", "run"),
-        when="^[virtuals=pil] py-pillow-simd",
-    )
-
-    depends_on("py-pyproj@3:", when="@0.5:", type=("build", "run"))
-    depends_on("py-pyproj@2.2:", type=("build", "run"))
-    depends_on("py-rasterio@1.2:", when="@0.5:", type=("build", "run"))
-    depends_on("py-rasterio@1.0.20:", when="@0.3:", type=("build", "run"))
-    depends_on("py-rasterio@1.0.16:", type=("build", "run"))
-    depends_on("py-rtree@1:", when="@0.3:", type=("build", "run"))
-    depends_on("py-rtree@0.9.4:", when="@0.2.1:", type=("build", "run"))
-    depends_on("py-rtree@0.5:", type=("build", "run"))
-    depends_on("py-segmentation-models-pytorch@0.2:", type=("build", "run"))
-    depends_on("py-shapely@1.7.1:", when="@0.5:", type=("build", "run"))
-    depends_on("py-shapely@1.3:", type=("build", "run"))
-    depends_on("py-timm@0.4.12:", type=("build", "run"))
-    depends_on("py-torch@1.12:", when="@0.4:", type=("build", "run"))
-    depends_on("py-torch@1.9:", when="@0.2:", type=("build", "run"))
-    depends_on("py-torch@1.7:", type=("build", "run"))
-    depends_on("py-torchmetrics@0.10:", when="@0.4:", type=("build", "run"))
-    depends_on("py-torchmetrics@0.7:", type=("build", "run"))
-    depends_on("py-torchvision@0.13:", when="@0.4:", type=("build", "run"))
-    depends_on("py-torchvision@0.10:", when="@0.2:", type=("build", "run"))
-    depends_on("py-torchvision@0.3:", type=("build", "run"))
+    with default_args(type="build"):
+        depends_on("py-setuptools@61:", when="@0.5:")
+        depends_on("py-setuptools@42:")
+
+    with default_args(type=("build", "run")):
+        depends_on("python@3.10:", when="@0.6:")
+        depends_on("python@3.9:", when="@0.5:")
+        depends_on("py-einops@0.3:")
+        depends_on("py-fiona@1.8.21:", when="@0.6:")
+        depends_on("py-fiona@1.8.19:", when="@0.5:")
+        depends_on("py-fiona@1.8:", when="@0.3:")
+        depends_on("py-fiona@1.5:")
+        depends_on("py-kornia@0.7.3:", when="@0.6:")
+        depends_on("py-kornia@0.6.9:", when="@0.5:")
+        depends_on("py-kornia@0.6.5:", when="@0.4:")
+        depends_on("py-kornia@0.6.4:", when="@0.3:")
+        depends_on("py-kornia@0.5.11:", when="@0.2:")
+        depends_on("py-kornia@0.5.4:", when="@0.1:")
+        depends_on("py-lightly@1.4.5:", when="@0.6:")
+        depends_on("py-lightly@1.4.4:", when="@0.5:")
+        depends_on("py-lightning@2:", when="@0.5:")
+        depends_on("py-lightning@1.8:", when="@0.4.1:")
+        depends_on("py-matplotlib@3.5:", when="@0.6:")
+        depends_on("py-matplotlib@3.3.3:", when="@0.5:")
+        depends_on("py-matplotlib@3.3:")
+        depends_on("py-numpy@1.21.2:", when="@0.6:")
+        depends_on("py-numpy@1.19.3:", when="@0.5:")
+        depends_on("py-numpy@1.17.2:")
+        depends_on("py-pandas@1.3.3:", when="@0.6:")
+        depends_on("py-pandas@1.1.3:", when="@0.5:")
+        depends_on("pil@8.4:", when="@0.6:")
+        depends_on("pil@8:", when="@0.5:")
+        depends_on("pil@6.2:")
+        depends_on("py-pyproj@3.3:", when="@0.6:")
+        depends_on("py-pyproj@3:", when="@0.5:")
+        depends_on("py-pyproj@2.2:")
+        depends_on("py-rasterio@1.3:", when="@0.6:")
+        depends_on("py-rasterio@1.2:", when="@0.5:")
+        depends_on("py-rasterio@1.0.20:", when="@0.3:")
+        depends_on("py-rasterio@1.0.16:")
+        depends_on("py-rtree@1:", when="@0.3:")
+        depends_on("py-rtree@0.9.4:", when="@0.2.1:")
+        depends_on("py-rtree@0.5:")
+        depends_on("py-segmentation-models-pytorch@0.2:")
+        depends_on("py-shapely@1.8:", when="@0.6:")
+        depends_on("py-shapely@1.7.1:", when="@0.5:")
+        depends_on("py-shapely@1.3:")
+        depends_on("py-timm@0.4.12:")
+        depends_on("py-torch@1.13:", when="@0.6:")
+        depends_on("py-torch@1.12:", when="@0.4:")
+        depends_on("py-torch@1.9:", when="@0.2:")
+        depends_on("py-torch@1.7:")
+        depends_on("py-torchmetrics@0.10:", when="@0.4:")
+        depends_on("py-torchmetrics@0.7:")
+        depends_on("py-torchvision@0.14:", when="@0.6:")
+        depends_on("py-torchvision@0.13:", when="@0.4:")
+        depends_on("py-torchvision@0.10:", when="@0.2:")
+        depends_on("py-torchvision@0.3:")
+
+        # Only part of lightning[pytorch-extra] we actually require.
+        depends_on("py-jsonargparse@4.26.1:+signatures", when="@0.5:")
+
+        # Historical dependencies
+        depends_on("py-omegaconf@2.1:", when="@:0.4.0")
+        depends_on("py-packaging@17:", when="@0.3")
+        depends_on("py-pytorch-lightning@1.5.1:", when="@0.3.1:0.4.0")
+        # https://github.com/microsoft/torchgeo/pull/697
+        depends_on("py-pytorch-lightning@1.5.1:1.8", when="@0.3.0")
+        depends_on("py-pytorch-lightning@1.3:1.8", when="@:0.2")
+        depends_on("py-scikit-learn@0.21:", when="@0.3:0.4")
+        depends_on("py-scikit-learn@0.18:", when="@:0.2")
 
     # Optional dependencies
-    with when("+datasets"):
+    with when("+datasets"), default_args(type="run"):
+        depends_on("py-h5py@3.6:", when="@0.6:")
+        depends_on("py-h5py@3:", when="@0.5:")
+        depends_on("py-h5py@2.6:")
+        depends_on("py-laspy@2:", when="@0.2:")
+        depends_on("opencv@4.5.4:", when="@0.6:")
+        depends_on("opencv@4.4.0.46:", when="@0.5:")
+        depends_on("opencv@3.4.2.17:")
+        depends_on("py-pycocotools@2.0.7:", when="@0.6:")
+        depends_on("py-pycocotools@2.0.5:", when="@0.5:")
+        depends_on("py-pycocotools@2:")
+        depends_on("py-pyvista@0.34.2:", when="@0.5:")
+        depends_on("py-pyvista@0.20:", when="@0.4:")
+        depends_on("py-scikit-image@0.19:", when="@0.6:")
+        depends_on("py-scikit-image@0.18:", when="@0.4:")
+        depends_on("py-scipy@1.7.2:", when="@0.6:")
+        depends_on("py-scipy@1.6.2:", when="@0.4:")
+        depends_on("py-scipy@1.2:", when="@0.3:")
+        depends_on("py-scipy@0.9:")
+
+        # Required to download SpaceNet datasets.
+        depends_on("awscli-v2", when="@0.6:")
+        # Required to download Source Cooperative datasets.
+        depends_on("azcopy", when="@0.6:")
+        # Required to download Google Drive datasets.
+        depends_on("py-gdown", when="^py-torchvision@0.17.1:")
+        # bz2 required to extract .tar.bz2 files, zlib required to extract .tar.gz files.
+        depends_on("python+bz2+zlib")
+        # JPEG, JPEG2000, TIFF, compressed PNG support required for file I/O in several datasets.
+        depends_on("py-pillow+jpeg+jpeg2000+tiff+zlib", when="^[virtuals=pil] py-pillow")
+        depends_on("py-pillow-simd+jpeg+jpeg2000+tiff+zlib", when="^[virtuals=pil] py-pillow-simd")
         # GDAL and libtiff are both dependencies of rasterio.
         # Sentinel 2 dataset requires OpenJPEG to read .jp2 files.
-        depends_on("gdal+openjpeg", when="@0.3.1:", type="run")
+        depends_on("gdal+openjpeg", when="@0.3.1:")
         # JPEG required for GDAL to read JPEG files
         # LIBDEFLATE, ZLIB, and ZSTD required for compressed file I/O.
-        depends_on("libtiff+jpeg+libdeflate+zlib+zstd", type="run")
-        depends_on("py-h5py@3:", when="@0.5:", type="run")
-        depends_on("py-h5py@2.6:", type="run")
-        depends_on("py-laspy@2:", when="@0.2:", type="run")
-        depends_on("opencv@4.4.0.46:", when="@0.5:", type="run")
-        depends_on("opencv@3.4.2.17:", type="run")
+        depends_on("libtiff+jpeg+libdeflate+zlib+zstd")
         # LandCover.ai dataset requires ability to read .tif and write .jpg and .png files.
         # Doing this from Python requires both imgcodecs and Python bindings.
-        depends_on("opencv+imgcodecs+jpeg+png+python3+tiff", type="run")
-        depends_on("py-pycocotools@2.0.5:", when="@0.5:", type="run")
-        depends_on("py-pycocotools@2:", type="run")
-        depends_on("py-pyvista@0.34.2:", when="@0.5:", type="run")
-        depends_on("py-pyvista@0.20:", when="@0.4:", type="run")
-        depends_on("py-radiant-mlhub@0.3:", 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@4:", when="@0.5:", type="run")
-        depends_on("py-rarfile@3:", type="run")
-        depends_on("py-scikit-image@0.18:", when="@0.4:", type="run")
-        depends_on("py-scipy@1.6.2:", when="@0.4:", type="run")
-        depends_on("py-scipy@1.2:", when="@0.3:", type="run")
-        depends_on("py-scipy@0.9:", type="run")
-        depends_on("py-zipfile-deflate64@0.2:", when="@0.2.1:", type="run")
-
-    with when("+docs"):
-        depends_on("py-ipywidgets@7:", type="run")
-        depends_on("py-nbsphinx@0.8.5:", type="run")
-        depends_on("py-pytorch-sphinx-theme", type="run")
-        depends_on("py-sphinx@4:5", type="run")
-
-    with when("+style"):
-        depends_on("py-black@21.8:+jupyter", when="@0.3:", type="run")
-        depends_on("py-black@21:", type="run")
-        depends_on("py-flake8@3.8:", type="run")
-        depends_on("py-isort@5.8:+colors", type="run")
-        depends_on("py-pydocstyle@6.1:+toml", type="run")
-        depends_on("py-pyupgrade@2.8:", when="@0.5:", type="run")
-        depends_on("py-pyupgrade@1.24:", when="@0.3:", type="run")
-
-    with when("+tests"):
-        depends_on("py-mypy@0.900:", type="run")
-        depends_on("py-nbmake@1.3.3:", when="@0.4.1:", type="run")
-        depends_on("py-nbmake@0.1:", when="@0.3.1:", type="run")
-        depends_on("py-nbmake@0.1:1.1", when="@:0.3.0", type="run")
-        depends_on("py-pytest@6.2:", when="@0.5:", type="run")
-        depends_on("py-pytest@6.1.2:", type="run")
-        depends_on("py-pytest-cov@2.4:", type="run")
-
-    # Historical dependencies
-    depends_on("py-omegaconf@2.1:", when="@:0.4.0", type=("build", "run"))
-    depends_on("py-packaging@17:", when="@0.3", type=("build", "run"))
-    depends_on("py-pytorch-lightning@1.5.1:", when="@0.3.1:0.4.0", type=("build", "run"))
-    # https://github.com/microsoft/torchgeo/pull/697
-    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"))
-    depends_on("py-scikit-learn@0.21:", when="@0.3:0.4", type=("build", "run"))
-    depends_on("py-scikit-learn@0.18:", when="@:0.2", type=("build", "run"))
-    depends_on("open3d@0.11.2:+python", when="@0.2:0.3+datasets", type="run")
-    # https://github.com/microsoft/torchgeo/pull/1537
-    depends_on("py-pandas@0.23.2:2.0", when="@0.3:0.4+datasets", type="run")
-    depends_on("py-pandas@0.19.1:2.0", when="@0.2+datasets", type="run")
-    depends_on("py-omegaconf@2.1:", when="@0.4.1+tests", type="run")
-    depends_on("py-tensorboard@2.9.1:", when="@0.4.1+tests", type="run")
+        depends_on("opencv+imgcodecs+jpeg+png+python3+tiff")
+
+        # Historical dependencies
+        depends_on("open3d@0.11.2:+python", when="@0.2:0.3")
+        # https://github.com/microsoft/torchgeo/pull/1537
+        depends_on("py-pandas@0.23.2:2.0", when="@0.3:0.4")
+        depends_on("py-pandas@0.19.1:2.0", when="@0.2")
+        depends_on("py-radiant-mlhub@0.3:", when="@0.4.1:0.5")
+        depends_on("py-radiant-mlhub@0.2.1:0.4", when="@:0.4.0")
+        depends_on("py-rarfile@4:", when="@0.5")
+        depends_on("py-rarfile@3:", when="@:0.4")
+        depends_on("py-zipfile-deflate64@0.2:", when="@0.2.1:")
+
+    with when("+docs"), default_args(type="run"):
+        depends_on("py-ipywidgets@7:")
+        depends_on("py-nbsphinx@0.8.5:")
+        depends_on("py-pytorch-sphinx-theme")
+        depends_on("py-sphinx@4:5")
+
+    with when("+style"), default_args(type="run"):
+        depends_on("prettier@3:", when="@0.6:")
+        depends_on("py-mypy@0.900:")
+        depends_on("py-ruff@0.2:", when="@0.6:")
+
+        # Historical dependencies
+        depends_on("py-black@21.8:+jupyter", when="@0.3:0.5")
+        depends_on("py-black@21:", when="@:0.2")
+        depends_on("py-flake8@3.8:", when="@:0.5")
+        depends_on("py-isort@5.8:+colors", when="@:0.5")
+        depends_on("py-pydocstyle@6.1:+toml", when="@:0.5")
+        depends_on("py-pyupgrade@2.8:", when="@0.5")
+        depends_on("py-pyupgrade@1.24:", when="@0.3:0.4")
+
+    with when("+tests"), default_args(type="run"):
+        depends_on("py-nbmake@1.3.3:", when="@0.4.1:")
+        depends_on("py-nbmake@0.1:", when="@0.3.1:")
+        depends_on("py-nbmake@0.1:1.1", when="@:0.3.0")
+        depends_on("py-pytest@7.3:", when="@0.6:")
+        depends_on("py-pytest@6.2:", when="@0.5:")
+        depends_on("py-pytest@6.1.2:")
+        depends_on("py-pytest-cov@4:", when="@0.6:")
+        depends_on("py-pytest-cov@2.4:")
+
+        # Historical dependencies
+        depends_on("py-omegaconf@2.1:", when="@0.4.1")
+        depends_on("py-tensorboard@2.9.1:", when="@0.4.1")
 
+    # https://github.com/microsoft/torchgeo/pull/1123
+    conflicts("py-kornia@0.6.10:", when="@:0.4.0")
     # https://github.com/Lightning-AI/pytorch-lightning/issues/19977
-    conflicts("py-lightning@2.3")
+    conflicts("py-lightning@2.3", when="@0.4.1:")
+    # https://github.com/microsoft/torchgeo/pull/2151
+    conflicts("py-numpy@2:", when="@:0.5")