diff --git a/var/spack/repos/builtin/packages/py-pandas/package.py b/var/spack/repos/builtin/packages/py-pandas/package.py index 9b9b2bc7317..381aa85c029 100644 --- a/var/spack/repos/builtin/packages/py-pandas/package.py +++ b/var/spack/repos/builtin/packages/py-pandas/package.py @@ -114,6 +114,7 @@ class PyPandas(PythonPackage): variant("performance", default=True, description="Build recommended performance dependencies") variant("excel", when="@1.4:", default=False, description="Build with support for Excel") + variant("parquet", when="@2:", default=False, description="Build with support for Parquet") depends_on("c", type="build") depends_on("cxx", type="build") @@ -205,3 +206,6 @@ class PyPandas(PythonPackage): depends_on("py-xlsxwriter@3.0.3:", when="@2.1:") depends_on("py-xlsxwriter@1.4.3:", when="@1.5:") depends_on("py-xlsxwriter@1.2.2:", when="@1.4:") + + with when("+parquet"): + depends_on("py-pyarrow@10.0.1:") diff --git a/var/spack/repos/builtin/packages/py-torchgeo/package.py b/var/spack/repos/builtin/packages/py-torchgeo/package.py index c4f9ad71900..7f9d344fb1f 100644 --- a/var/spack/repos/builtin/packages/py-torchgeo/package.py +++ b/var/spack/repos/builtin/packages/py-torchgeo/package.py @@ -16,6 +16,7 @@ class PyTorchgeo(PythonPackage): maintainers("adamjstewart", "calebrob6") version("main", branch="main") + version("0.7.0", sha256="4ba0e96ea826080f393b1bb719a3f8c364637112710b1ac38c56b9590a638e29") version("0.6.2", sha256="82f49f0d18d2c22cc70fc0690641e8dd60e4904a9c50d32c79ebd5020ac10fa7") version("0.6.1", sha256="38c930917ea341d05a7a611ff74c017f29482df7455d50e287ea79dec7d0a14b") version("0.6.0", sha256="c5b073b3c9ac06cd68e45620bab3a78fb7637fa3563aae4f75f4781ba57aee5a") @@ -45,13 +46,16 @@ class PyTorchgeo(PythonPackage): depends_on("py-setuptools@42:") with default_args(type=("build", "run")): + depends_on("python@3.11:", when="@0.7:") 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.22:", when="@0.7:") 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.4:", when="@0.7:") 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:") @@ -62,42 +66,56 @@ class PyTorchgeo(PythonPackage): 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.6:", when="@0.7:") 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.23.2:", when="@0.7:") 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.5:", when="@0.7:") depends_on("py-pandas@1.3.3:", when="@0.6:") depends_on("py-pandas@1.1.3:", when="@0.5:") + depends_on("pil@9.2:", when="@0.7:") 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.4:", when="@0.7:") 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.3:", when="@0.7:") 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.0.1:", when="@0.7:") 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.3.3:", when="@0.7:") depends_on("py-segmentation-models-pytorch@0.2:") + depends_on("py-shapely@1.8.5:", when="@0.7:") 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.9.2:", when="@0.7:") depends_on("py-timm@0.4.12:") + depends_on("py-torch@2:", when="@0.7:") 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@1.2:", when="@0.7:") depends_on("py-torchmetrics@0.10:", when="@0.4:") depends_on("py-torchmetrics@0.7:") + depends_on("py-torchvision@0.15.1:", when="@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:") + depends_on("py-typing-extensions@4.5:", when="@0.7:") # Only part of lightning[pytorch-extra] we actually require. depends_on("py-jsonargparse@4.26.1:+signatures", when="@0.5:") @@ -114,24 +132,30 @@ class PyTorchgeo(PythonPackage): # Optional dependencies with when("+datasets"), default_args(type="run"): + depends_on("py-h5py@3.8:", when="@0.7:") 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("py-netcdf4@1.6.1:", when="@0.7:") + depends_on("opencv@4.5.5:", when="@0.7:") 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-pandas@2:+parquet", when="@0.7:") 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:0.6") - depends_on("py-pyvista@0.20:", when="@0.4") + depends_on("py-scikit-image@0.20:", when="@0.7:") 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.9.2:", when="@0.7:") 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:") + depends_on("py-webdataset@0.2.4:", when="@0.7:") + depends_on("py-xarray@0.12.3:", when="@0.7:") # Required to download SpaceNet datasets. depends_on("awscli-v2", when="@0.6:") @@ -159,6 +183,8 @@ class PyTorchgeo(PythonPackage): # 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-pyvista@0.34.2:", when="@0.5:0.6") + depends_on("py-pyvista@0.20:", when="@0.4") 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") @@ -174,6 +200,7 @@ class PyTorchgeo(PythonPackage): 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.9:", when="@0.7:") depends_on("py-ruff@0.2:", when="@0.6:") # Historical dependencies