From 49c29b1d0fb4cc45b60084198208f883700c9648 Mon Sep 17 00:00:00 2001 From: Wei Ji <23487320+weiji14@users.noreply.github.com> Date: Mon, 3 Apr 2023 10:44:23 +1200 Subject: [PATCH] :wrench: Put xpystac under the stac extras Decided that xpystac fits better under the 'stac' extras, because it depends on just pystac and xarray, and has a somewhat optional dependency on stackstac. This enables a more streamlined I/O option for reading STAC Assets into an xarray.Dataset. Note that Zarr is kept under the 'raster' extras. --- docs/index.md | 4 ++-- poetry.lock | 6 +++--- pyproject.toml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/index.md b/docs/index.md index 0c72098..fa36bc2 100644 --- a/docs/index.md +++ b/docs/index.md @@ -7,9 +7,9 @@ Get what you need, not more, not less: | Command | Dependencies | |:-------------------------------|---------------| | `pip install zen3geo` | rioxarray, torchdata | -| `pip install zen3geo[raster]` | rioxarray, torchdata, xbatcher, xpystac, zarr | +| `pip install zen3geo[raster]` | rioxarray, torchdata, xbatcher, zarr | | `pip install zen3geo[spatial]` | rioxarray, torchdata, datashader, spatialpandas | -| `pip install zen3geo[stac]` | rioxarray, torchdata, pystac, pystac-client, stackstac | +| `pip install zen3geo[stac]` | rioxarray, torchdata, pystac, pystac-client, stackstac, xpystac | | `pip install zen3geo[vector]` | rioxarray, torchdata, pyogrio[geopandas] | Retrieve more ['extras'](https://github.com/weiji14/zen3geo/blob/main/pyproject.toml) using diff --git a/poetry.lock b/poetry.lock index 999de6c..e77fb03 100644 --- a/poetry.lock +++ b/poetry.lock @@ -5062,12 +5062,12 @@ testing = ["func-timeout", "jaraco.itertools", "pytest (>=6)", "pytest-black (>= [extras] docs = ["adlfs", "contextily", "datashader", "graphviz", "jupyter-book", "matplotlib", "planetary-computer", "pyogrio", "pystac", "pystac-client", "stackstac", "spatialpandas", "xbatcher", "xpystac", "zarr"] -raster = ["xbatcher", "xpystac", "zarr"] +raster = ["xbatcher", "zarr"] spatial = ["datashader", "spatialpandas"] -stac = ["pystac", "pystac-client", "stackstac"] +stac = ["pystac", "pystac-client", "stackstac", "xpystac"] vector = ["pyogrio"] [metadata] lock-version = "2.0" python-versions = ">=3.8, <4.0" -content-hash = "64b046286aca49bf9fd8341c97f5da310afa07ef59873de86415d00b5cf556fc" +content-hash = "90dfbece41b0ddeecc3b882e82574ef0ac8c40b51fca9c7e201343d92595e4d1" diff --git a/pyproject.toml b/pyproject.toml index db3d8d8..789cb7b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -76,7 +76,6 @@ docs = [ ] raster = [ "xbatcher", - "xpystac", "zarr" ] spatial = [ @@ -86,7 +85,8 @@ spatial = [ stac = [ "pystac", "pystac_client", - "stackstac" + "stackstac", + "xpystac" ] vector = ["pyogrio"]