Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix minor JSON schema titles causing invalid ref definition names #542

Merged
merged 2 commits into from
Jul 7, 2023
Merged

fix minor JSON schema titles causing invalid ref definition names #542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68b7933
fix minor JSON schema titles causing invalid ref definition names
fmigneault Jul 6, 2023
e1c9b21
Merge branch 'master' into fixes-cwl-json-schema
fmigneault Jul 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 45 additions & 45 deletions tests/functional/application-packages/CatalogSearch/package.cwl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,51 +1,51 @@
{
"processDescription": {
"process": {
"id": "CatalogSearch",
"title": "Catalog Search for Thredds URLs",
"abstract": "Get files url from Thredds Catalog and provides file list as JSON Document.",
"keywords": [],
"inputs": [{
"id": "url",
"title": "URL of the Catalog",
"formats": [
{
"mimeType": "application/netcdf",
"default": true
},
{
"mimeType": "application/xml",
"default": true
}
],
"minOccurs": "1",
"maxOccurs": "1"
}],
"outputs": [
{
"id": "output",
"title": "JSON file with Catalog URLs",
"formats": [
{
"mimeType": "application/json",
"default": true
}
]
}
]
},
"processVersion": "1.0.0",
"jobControlOptions": [
"async-execute"
"processDescription": {
"process": {
"id": "CatalogSearch",
"title": "Catalog Search for Thredds URLs",
"abstract": "Get files url from Thredds Catalog and provides file list as JSON Document.",
"keywords": [ ],
"inputs": [ {
"id": "url",
"title": "URL of the Catalog",
"formats": [
{
"mimeType": "application/netcdf",
"default": true
},
{
"mimeType": "application/xml",
"default": true
}
],
"outputTransmission": [
"value"
]
},
"executionUnit": [
"minOccurs": "1",
"maxOccurs": "1"
} ],
"outputs": [
{
"href": "tests/functional/application-packages/CatalogSearch/package.cwl"
"id": "output",
"title": "JSON file with Catalog URLs",
"formats": [
{
"mimeType": "application/json",
"default": true
}
]
}
]
},
"processVersion": "1.0.0",
"jobControlOptions": [
"async-execute"
],
"deploymentProfileName": "http://www.opengis.net/profiles/eoc/wpsApplication"
"outputTransmission": [
"value"
]
},
"executionUnit": [
{
"href": "tests/functional/application-packages/CatalogSearch/package.cwl"
}
],
"deploymentProfileName": "http://www.opengis.net/profiles/eoc/wpsApplication"
}
5 changes: 2 additions & 3 deletions weaver/wps_restapi/swagger_definitions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4613,7 +4613,6 @@ class CWLTypeList(ExtendedSequenceSchema):


class CWLType(OneOfKeywordSchema):
title = "CWL Type"
_one_of = [
CWLTypeBase(summary="CWL type definition."),
CWLTypeList(summary="Combination of allowed CWL types."),
Expand Down Expand Up @@ -4663,7 +4662,7 @@ class CWLInputItem(CWLInputObject):


class CWLInputList(ExtendedSequenceSchema):
input = CWLInputItem(title="Input", description=f"Input specification. {CWL_DOC_MESSAGE}")
input = CWLInputItem(description=f"Input specification. {CWL_DOC_MESSAGE}")


class CWLInputEmpty(EmptyMappingSchema):
Expand Down Expand Up @@ -4729,7 +4728,7 @@ class CWLCommandParts(ExtendedSequenceSchema):
class CWLCommand(OneOfKeywordSchema):
_one_of = [
ExtendedSchemaNode(String(), title="String command."),
CWLCommandParts(title="Command Parts")
CWLCommandParts(title="CommandParts", summary="Command Parts")
]


Expand Down
Loading