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 a7dd1a8a453389b5cc2f24b589977553c690bcc1 Merge: 0502628 c920ea3 Author: rileykk <[email protected]> AuthorDate: Tue Jul 9 16:17:03 2024 -0700 Merge remote-tracking branch 'origin/develop' into SDAP-492-tomograms # Conflicts: # poetry.lock # pyproject.toml CHANGELOG.md | 4 + analysis/webservice/algorithms/Heartbeat.py | 10 +- analysis/webservice/algorithms/doms/StacCatalog.py | 2 +- .../nexus_tornado/app_builders/NexusAppBuilder.py | 2 +- data-access/nexustiles/AbstractTileService.py | 3 + .../nexustiles/backends/nexusproto/backend.py | 8 + data-access/nexustiles/backends/zarr/backend.py | 5 + data-access/nexustiles/nexustiles.py | 16 ++ poetry.lock | 305 +++++++++------------ pyproject.toml | 1 + 10 files changed, 169 insertions(+), 187 deletions(-) diff --cc pyproject.toml index 26036ab,c3edc5b..4bb7dba --- a/pyproject.toml +++ b/pyproject.toml @@@ -67,8 -67,7 +67,9 @@@ xarray = "^2022.3.0 dask = "*" zarr = "2.11.3" pandas = "<2.1.0rc0" +matplotlib = "^3.7" +basemap = "^1.2" + psutil = "*" [tool.poetry.dev-dependencies]
