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 e6258364a7d645cf6647240bf32c6c996a6044e5 Merge: 6d5b2e3 7158b7a Author: rileykk <[email protected]> AuthorDate: Wed Mar 20 14:10:58 2024 -0700 Merge branch 'SDAP-469-3d-data' into SDAP-492-tomograms # Conflicts: # analysis/conda-requirements.txt .gitignore | 2 + CHANGELOG.md | 3 +- VERSION.txt | 1 - analysis/conda-requirements.txt | 39 - analysis/package-list.txt | 68 - analysis/setup.py | 82 - analysis/webservice/webapp.py | 25 +- data-access/requirements.txt | 31 - data-access/setup.py | 55 - docker/nexus-webapp/Dockerfile | 155 +- docker/nexus-webapp/entrypoint.sh | 133 ++ docker/nexus-webapp/install_conda.sh | 42 - docker/nexus-webapp/install_nexusproto.sh | 4 + docker/nexus-webapp/install_python.sh | 48 + poetry.lock | 2545 +++++++++++++++++++++++++++++ pyproject.toml | 83 + tools/domspurge/purge.py | 10 +- 17 files changed, 2924 insertions(+), 402 deletions(-)
