This is an automated email from the ASF dual-hosted git repository. rkk pushed a commit to branch tmp-stv in repository https://gitbox.apache.org/repos/asf/sdap-nexus.git
commit dd2964a051b4e83635229a9338e88a89d64ae2c5 Merge: 973e65a 29d9c3c Author: rileykk <[email protected]> AuthorDate: Tue Jun 11 16:04:22 2024 -0700 Merge branch 'SDAP-469-3d-data' into SDAP-492-tomograms # Conflicts: # poetry.lock CHANGELOG.md | 6 + analysis/webservice/webapp.py | 16 +- data-access/nexustiles/AbstractTileService.py | 9 - data-access/nexustiles/backends/zarr/backend.py | 14 +- data-access/nexustiles/nexustiles.py | 26 +- docs/collections.rst | 164 ++++++++++ docs/index.rst | 7 +- docs/intro.rst | 4 - docs/quickstart.rst | 2 +- poetry.lock | 378 ++++++++++++++---------- pyproject.toml | 1 + 11 files changed, 428 insertions(+), 199 deletions(-) diff --cc pyproject.toml index 57d6a1d,a03d4e8..598234d --- a/pyproject.toml +++ b/pyproject.toml @@@ -64,10 -64,9 +64,11 @@@ s3fs = "2022.5.0 fsspec = "2022.5.0" aiohttp = "3.8.1" xarray = "^2022.3.0" + dask = "*" zarr = "2.11.3" pandas = "<2.1.0rc0" +matplotlib = "^3.7" +basemap = "^1.2" [tool.poetry.dev-dependencies]
