This is an automated email from the ASF dual-hosted git repository. rkk pushed a commit to branch SDAP-434 in repository https://gitbox.apache.org/repos/asf/incubator-sdap-nexus.git
commit 84a9daf0fcec9c6b148c008ecbdf336784df5044 Merge: 3d76a55 9ab3ec9 Author: rileykk <[email protected]> AuthorDate: Mon Mar 6 11:48:01 2023 -0800 Merge remote-tracking branch 'origin/master' into SDAP-434 # Conflicts: # CHANGELOG.md CHANGELOG.md | 10 ++++- DISCLAIMER-WIP | 18 ++++++++ NOTICE | 5 +++ README | 14 +++++++ analysis/__init__.py | 15 +++++++ analysis/conda-requirements.txt | 16 +++++++ analysis/package-list.txt | 16 +++++++ .../tests/algorithms/test_base_doms_handler.py | 15 +++++++ analysis/tests/algorithms/test_subsetter.py | 15 +++++++ analysis/tests/config/algorithms.ini | 15 +++++++ analysis/tests/conftest.py | 15 +++++++ analysis/tests/redirect/__init__.py | 15 +++++++ analysis/tests/redirect/collections-config.yaml | 15 +++++++ analysis/tests/redirect/test_RemoteSDAPCache.py | 15 +++++++ analysis/tests/webapp_test.py | 15 +++++++ analysis/webservice/NexusLivyHandler.py | 15 +++++++ analysis/webservice/algorithms/NexusCalcHandler.py | 15 +++++++ .../algorithms/doms/domsconfig.ini.default | 15 +++++++ analysis/webservice/algorithms/doms/insitu.py | 15 +++++++ analysis/webservice/algorithms/doms/subsetter.py | 20 ++++----- .../algorithms_spark/NexusCalcSparkHandler.py | 15 +++++++ analysis/webservice/algorithms_spark/utils.py | 15 +++++++ analysis/webservice/apidocs/__init__.py | 15 +++++++ analysis/webservice/apidocs/dataset-populate.js | 16 +++++++ analysis/webservice/apidocs/openapi.yml | 24 ++++++++--- analysis/webservice/config/algorithms.ini | 15 +++++++ analysis/webservice/config/web.ini | 15 +++++++ analysis/webservice/metrics/MetricsField.py | 15 +++++++ analysis/webservice/metrics/MetricsRecord.py | 15 +++++++ analysis/webservice/metrics/__init__.py | 15 +++++++ analysis/webservice/nexus_tornado/__init__.py | 15 +++++++ .../app_builders/HandlerArgsBuilder.py | 15 +++++++ .../nexus_tornado/app_builders/NexusAppBuilder.py | 15 +++++++ .../app_builders/RedirectAppBuilder.py | 15 +++++++ .../app_builders/SparkContextBuilder.py | 15 +++++++ .../nexus_tornado/app_builders/__init__.py | 15 +++++++ .../webservice/nexus_tornado/request/__init__.py | 15 +++++++ .../request/handlers/NexusRequestHandler.py | 15 +++++++ .../nexus_tornado/request/handlers/__init__.py | 15 +++++++ .../request/renderers/NexusCSVRenderer.py | 15 +++++++ .../request/renderers/NexusJSONRenderer.py | 15 +++++++ .../request/renderers/NexusNETCDFRenderer.py | 15 +++++++ .../request/renderers/NexusPNGRenderer.py | 15 +++++++ .../request/renderers/NexusRendererFactory.py | 15 +++++++ .../request/renderers/NexusZIPRenderer.py | 15 +++++++ .../nexus_tornado/request/renderers/__init__.py | 15 +++++++ analysis/webservice/redirect/RedirectHandler.py | 15 +++++++ .../webservice/redirect/RemoteCollectionMatcher.py | 15 +++++++ analysis/webservice/redirect/RemoteSDAPCache.py | 15 +++++++ analysis/webservice/redirect/__init__.py | 15 +++++++ analysis/webservice/webmodel/CustomEncoder.py | 15 +++++++ analysis/webservice/webmodel/Exceptions.py | 15 +++++++ analysis/webservice/webmodel/NexusRequestObject.py | 15 +++++++ .../webmodel/NexusRequestObjectTornadoFree.py | 15 +++++++ analysis/webservice/webmodel/NexusResults.py | 15 +++++++ analysis/webservice/webmodel/RequestParameters.py | 15 +++++++ .../webservice/webmodel/StandardNexusErrors.py | 15 +++++++ .../webservice/webmodel/StatsComputeOptions.py | 15 +++++++ analysis/webservice/webmodel/__init__.py | 15 +++++++ analysis/webservice/webmodel/cached.py | 15 +++++++ .../nexustiles/config/datastores.ini.default | 15 +++++++ data-access/nexustiles/dao/CassandraProxy.py | 49 ++++++++++------------ data-access/requirements.txt | 15 +++++++ data-access/tests/config/datastores.ini | 15 +++++++ docker/jupyter/requirements.txt | 15 +++++++ docs/conf.py | 17 +++++++- .../zipped_toolbox/daily_difference_average.py | 15 +++++++ .../esri/zipped_toolbox/lat_hof_moeller.py | 15 +++++++ .../esri/zipped_toolbox/lon_hof_moeller.py | 15 +++++++ integrations/esri/zipped_toolbox/matchup.py | 15 +++++++ .../esri/zipped_toolbox/time_average_map.py | 15 +++++++ .../esri/zipped_toolbox/time_series_script.py | 15 +++++++ tests/regression/conftest.py | 15 +++++++ tools/cdms/requirements.txt | 15 +++++++ tools/deletebyquery/deletebyquery.py | 11 +++++ tools/deletebyquery/requirements.txt | 15 +++++++ tools/rmqmonitor/monitor.py | 14 +++++++ 77 files changed, 1144 insertions(+), 46 deletions(-) diff --cc CHANGELOG.md index 2f1910f,ae01564..9ed53e5 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@@ -10,10 -11,12 +11,13 @@@ and this project adheres to [Semantic V ### Deprecated ### Removed ### Fixed - - SDAP-434: Temporary fix for conda install step in docker image build breaking conda + - Made `platforms` param optional in `/cdmssubset`, and removed int requirement + - Updated OpenAPI specification for `/cdmssubset` to accurately reflect `platforms` and `parameter` field options. + - SDAP-436: Added special case for handling Cassandra SwathMulti tiles with uniform time arrays ++- SDAP-434: Fix for webapp Docker image build failure ### Security - ## [1.0.0] - 2022-11-22 + ## [1.0.0] - 2022-12-05 ### Added - SDAP-388: Enable SDAP to proxy/redirect to alternate SDAP - SDAP-372: Updated matchup algorithm to point to AWS insitu API endpoint
