This is an automated email from the ASF dual-hosted git repository. rkk pushed a commit to branch SDAP-521 in repository https://gitbox.apache.org/repos/asf/sdap-nexus.git
commit 89ee0d6635185a956ea47c11b103a96c1e9a5592 Merge: 829dc07 da370b6 Author: rileykk <[email protected]> AuthorDate: Mon Sep 23 13:08:44 2024 -0700 Merge remote-tracking branch 'origin/develop' into SDAP-521 # Conflicts: # docs/index.rst # docs/release.rst CHANGELOG.md | 13 + analysis/webservice/algorithms/Tomogram.py | 1662 ++++++++++++++++++++ analysis/webservice/algorithms/Tomogram3D.py | 894 +++++++++++ analysis/webservice/algorithms/__init__.py | 2 + ...NexusRendererFactory.py => NexusGIFRenderer.py} | 27 +- .../request/renderers/NexusRendererFactory.py | 2 +- .../nexus_tornado/request/renderers/__init__.py | 3 +- analysis/webservice/webmodel/NexusRequestObject.py | 6 +- analysis/webservice/webmodel/NexusResults.py | 1 - data-access/nexustiles/AbstractTileService.py | 4 + .../nexustiles/backends/nexusproto/backend.py | 4 + .../backends/nexusproto/dao/SolrProxy.py | 59 +- data-access/nexustiles/backends/zarr/backend.py | 24 +- data-access/nexustiles/nexustiles.py | 50 + helm/values.yaml | 2 +- poetry.lock | 932 ++++++----- pyproject.toml | 1 + tools/build/README.md | 31 + tools/build/build.py | 616 ++++++++ tools/build/requirements.txt | 4 + 20 files changed, 3863 insertions(+), 474 deletions(-)
