Skip to content

Commit

Permalink
bump to 2023.10.02
Browse files Browse the repository at this point in the history
  • Loading branch information
@jnussbaum
jnussbaum committed Oct 20, 2023
1 parent fd6950a commit abaa264
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion dsp/dsp-api
Submodule dsp-api updated 65 files
+6 −13 .github/pull_request_template.md
+2 −0 .scala-steward.conf
+33 −0 CHANGELOG.md
+2 −2 docker-compose.yml
+72 −25 docs/03-endpoints/api-admin/projects.md
+14 −35 docs/03-endpoints/api-v2/authentication.md
+14 −3 integration/src/test/scala/org/knora/webapi/core/LayersTest.scala
+97 −2 integration/src/test/scala/org/knora/webapi/e2e/admin/ProjectsADME2EZioHttpSpec.scala
+0 −19 ...ion/src/test/scala/org/knora/webapi/messages/admin/responder/projectsmessages/ProjectsMessagesADMSpec.scala
+3 −3 ...on/src/test/scala/org/knora/webapi/messages/util/search/gravsearch/transformers/SparqlTransformerSpec.scala
+9 −13 integration/src/test/scala/org/knora/webapi/responders/admin/ProjectsResponderADMSpec.scala
+0 −3 mkdocs.yml
+45 −25 project/Dependencies.scala
+1 −1 project/build.properties
+2 −2 project/plugins.sbt
+1 −1 version.txt
+24 −2 webapi/src/main/scala/dsp/errors/Errors.scala
+6 −4 webapi/src/main/scala/dsp/valueobjects/Iri.scala
+7 −0 webapi/src/main/scala/dsp/valueobjects/Project.scala
+47 −0 webapi/src/main/scala/dsp/valueobjects/RestrictedViewSize.scala
+14 −3 webapi/src/main/scala/org/knora/webapi/core/LayersLive.scala
+1 −1 webapi/src/main/scala/org/knora/webapi/http/status/ApiStatusCodesV2.scala
+1 −1 webapi/src/main/scala/org/knora/webapi/http/status/ApiStatusCodesZ.scala
+25 −168 webapi/src/main/scala/org/knora/webapi/messages/admin/responder/projectsmessages/ProjectsMessagesADM.scala
+0 −81 webapi/src/main/scala/org/knora/webapi/messages/admin/responder/projectsmessages/ProjectsPayloadsADM.scala
+1 −1 webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/transformers/ConstructTransformer.scala
+1 −1 webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/transformers/SelectTransformer.scala
+11 −12 webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/transformers/SparqlTransformer.scala
+32 −33 webapi/src/main/scala/org/knora/webapi/responders/admin/ProjectsResponderADM.scala
+32 −37 webapi/src/main/scala/org/knora/webapi/routing/ApiRoutes.scala
+11 −1 webapi/src/main/scala/org/knora/webapi/routing/AroundDirectives.scala
+3 −0 webapi/src/main/scala/org/knora/webapi/routing/Authenticator.scala
+56 −0 webapi/src/main/scala/org/knora/webapi/routing/PathVariables.scala
+0 −325 webapi/src/main/scala/org/knora/webapi/routing/admin/ProjectsRouteADM.scala
+51 −20 webapi/src/main/scala/org/knora/webapi/routing/admin/ProjectsRouteZ.scala
+26 −0 webapi/src/main/scala/org/knora/webapi/slice/admin/api/AdminApiRoutes.scala
+43 −0 webapi/src/main/scala/org/knora/webapi/slice/admin/api/MaintenanceEndpoints.scala
+35 −0 webapi/src/main/scala/org/knora/webapi/slice/admin/api/MaintenanceEndpointsHandlers.scala
+202 −0 webapi/src/main/scala/org/knora/webapi/slice/admin/api/ProjectsEndpoints.scala
+237 −0 webapi/src/main/scala/org/knora/webapi/slice/admin/api/ProjectsEndpointsHandler.scala
+55 −0 webapi/src/main/scala/org/knora/webapi/slice/admin/api/model/MaintenanceRequests.scala
+4 −4 webapi/src/main/scala/org/knora/webapi/slice/admin/api/model/ProjectExportResponse.scala
+49 −0 webapi/src/main/scala/org/knora/webapi/slice/admin/api/model/ProjectsEndpointsRequests.scala
+56 −0 webapi/src/main/scala/org/knora/webapi/slice/admin/api/service/MaintenanceRestService.scala
+108 −84 webapi/src/main/scala/org/knora/webapi/slice/admin/api/service/ProjectsADMRestService.scala
+2 −0 webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/KnoraProjectRepo.scala
+154 −0 webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/MaintenanceService.scala
+19 −0 webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/ProjectADMService.scala
+11 −0 webapi/src/main/scala/org/knora/webapi/slice/admin/repo/service/KnoraProjectRepoLive.scala
+93 −0 webapi/src/main/scala/org/knora/webapi/slice/common/api/BaseEndpoints.scala
+63 −0 webapi/src/main/scala/org/knora/webapi/slice/common/api/HandlerMapper.scala
+51 −0 webapi/src/main/scala/org/knora/webapi/slice/common/api/TapirToPekkoInterpreter.scala
+17 −17 webapi/src/main/scala/org/knora/webapi/store/triplestore/api/TriplestoreServiceInMemory.scala
+35 −0 .../main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/setProjectRestrictedViewSettings.scala.txt
+47 −0 webapi/src/test/scala/dsp/valueobjects/RestrictedViewSizeSpec.scala
+17 −0 webapi/src/test/scala/org/knora/webapi/TestDataFactory.scala
+39 −24 webapi/src/test/scala/org/knora/webapi/responders/admin/ProjectADMRestServiceMock.scala
+9 −19 webapi/src/test/scala/org/knora/webapi/responders/admin/ProjectsResponderADMMock.scala
+25 −17 webapi/src/test/scala/org/knora/webapi/responders/admin/ProjectsServiceLiveSpec.scala
+7 −4 webapi/src/test/scala/org/knora/webapi/routing/admin/ProjectsRouteZSpec.scala
+122 −0 webapi/src/test/scala/org/knora/webapi/slice/admin/api/service/MaintenanceServiceLiveSpec.scala
+3 −0 webapi/src/test/scala/org/knora/webapi/slice/admin/domain/repo/service/KnoraProjectRepoInMemory.scala
+3 −0 webapi/src/test/scala/org/knora/webapi/slice/admin/domain/service/KnoraProjectRepoInMemory.scala
+2 −1 webapi/src/test/scala/org/knora/webapi/slice/common/repo/service/AbstractInMemoryCrudRepository.scala
+11 −0 webapi/src/test/scala/org/knora/webapi/store/triplestore/TestDatasetBuilder.scala
2 changes: 1 addition & 1 deletion dsp/dsp-app
Submodule dsp-app updated from 5d7da6 to 58895b
2 changes: 1 addition & 1 deletion dsp/dsp-tools
Submodule dsp-tools updated 76 files
+1 −0 .darglint
+1 −2 .github/workflows/check-pr-title.yml
+97 −33 .github/workflows/tests-on-push.yml
+0 −1 .gitignore
+36 −0 CHANGELOG.md
+3 −0 README.md
+0 −1 docs/cli-commands.md
+5 −3 docs/file-formats/xml-data-file.md
+694 −566 poetry.lock
+37 −36 pyproject.toml
+0 −0 src/dsp_tools/analyse_xml_data/__init__.py
+301 −0 src/dsp_tools/analyse_xml_data/construct_and_analyze_graph.py
+47 −0 src/dsp_tools/analyse_xml_data/models.py
+16 −8 src/dsp_tools/cli.py
+0 −0 src/dsp_tools/connection/__init__.py
+94 −0 src/dsp_tools/connection/connection.py
+9 −2 src/dsp_tools/connection/connection_live.py
+2 −1 src/dsp_tools/excel2xml.py
+1 −1 src/dsp_tools/fast_xmlupload/upload_files.py
+2 −3 src/dsp_tools/fast_xmlupload/upload_xml.py
+6 −10 src/dsp_tools/models/group.py
+5 −3 src/dsp_tools/models/helpers.py
+8 −15 src/dsp_tools/models/listnode.py
+1 −4 src/dsp_tools/models/model.py
+10 −25 src/dsp_tools/models/ontology.py
+5 −5 src/dsp_tools/models/project.py
+1 −1 src/dsp_tools/models/projectContext.py
+4 −16 src/dsp_tools/models/propertyclass.py
+3 −3 src/dsp_tools/models/resource.py
+12 −51 src/dsp_tools/models/resourceclass.py
+1 −1 src/dsp_tools/models/sipi.py
+16 −16 src/dsp_tools/models/user.py
+10 −6 src/dsp_tools/models/value.py
+10 −1 src/dsp_tools/models/xmlresource.py
+27 −5 src/dsp_tools/resources/start-stack/docker-compose.yml
+1 −1 src/dsp_tools/resources/start-stack/start-stack-config.yml
+1 −1 src/dsp_tools/utils/project_create.py
+1 −1 src/dsp_tools/utils/project_create_lists.py
+2 −2 src/dsp_tools/utils/project_get.py
+2 −3 src/dsp_tools/utils/rosetta.py
+3 −2 src/dsp_tools/utils/shared.py
+0 −0 src/dsp_tools/utils/xmlupload/create_upload_order_stash_circles.py
+49 −77 src/dsp_tools/utils/xmlupload/resource_multimedia.py
+0 −0 src/dsp_tools/utils/xmlupload/stash/__init__.py
+98 −0 src/dsp_tools/utils/xmlupload/stash/stash_models.py
+56 −80 src/dsp_tools/utils/xmlupload/stash_circular_references.py
+75 −0 src/dsp_tools/utils/xmlupload/upload_config.py
+56 −156 src/dsp_tools/utils/xmlupload/upload_stashed_resptr_props.py
+103 −267 src/dsp_tools/utils/xmlupload/upload_stashed_xml_texts.py
+10 −101 src/dsp_tools/utils/xmlupload/write_diagnostic_info.py
+213 −285 src/dsp_tools/utils/xmlupload/xmlupload.py
+0 −0 test/benchmarking/__init__.py
+30 −0 test/benchmarking/test_stash_circular_references.py
+2 −3 test/e2e/test_00A1_import_scripts.py
+6 −6 test/e2e/test_connection_live.py
+3 −2 test/e2e/test_group.py
+3 −2 test/e2e/test_listnode.py
+3 −2 test/e2e/test_ontology.py
+3 −2 test/e2e/test_project.py
+3 −2 test/e2e/test_propertyclass.py
+3 −2 test/e2e/test_resource.py
+3 −2 test/e2e/test_resourceclass.py
+4 −3 test/e2e/test_user.py
+3 −6 test/e2e/test_xmlupload.py
+0 −0 test/unittests/test_analyse_xml_data/__init__.py
+202 −0 test/unittests/test_analyse_xml_data/test_construct_and_analyze_graph.py
+275 −0 test/unittests/test_cli_with_mock.py
+57 −0 test/unittests/test_xmlupload/test_upload_config.py
+184 −0 test/unittests/test_xmlupload/test_upload_stash_with_mock.py
+2 −7 test/unittests/test_xmlupload/test_upload_stashed_xml_texts.py
+0 −131 test/unittests/test_xmlupload/test_xmlupload.py
+0 −0 testdata/__init__.py
+57 −0 testdata/xml-data/circular-references/analyse_circles_in_xml.py
+305 −0 testdata/xml-data/circular-references/create_complex_circular_references.py
+150 −0 testdata/xml-data/circular-references/test_circles_onto.json
+305 −0 testdata/xml-data/circular-references/test_circular_references_1.xml
8 changes: 4 additions & 4 deletions release.mk
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# for DSP, API, APP, see https://github.com/dasch-swiss/ops-deploy/blob/main/roles/dsp-deploy/files/RELEASE.json
# for TOOLS, see https://github.com/dasch-swiss/dsp-tools/releases
DSP := "2023.10.01"
API := "v30.3.0"
APP := "v10.23.7"
TOOLS := "v5.0.2"
DSP := "2023.10.02"
API := "v30.4.0"
APP := "v10.24.2"
TOOLS := "v5.0.3"

0 comments on commit abaa264

Please sign in to comment.