Skip to content

Commit

Permalink
bump pywps=4.5.1 to resolve pending issues (relates to #352 for geopy…
Browse files Browse the repository at this point in the history
  • Loading branch information
fmigneault committed Mar 25, 2022
1 parent 42c94dd commit 15a4f34
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 16 deletions.
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ python-dateutil
pyramid_rewrite
pyramid_storage
pytz
pywps==4.5.0
pywps==4.5.1
pyyaml>=5.2
# required by: cwltool => schema_salad, make requirement stricter because it has longer wheel build time
rdflib-jsonld==0.5.0
Expand Down
16 changes: 1 addition & 15 deletions weaver/wps/service.py
Original file line number Diff line number Diff line change
Expand Up @@ -120,19 +120,11 @@ class WorkerExecuteResponse(ExecuteResponse):
"""
XML response generator from predefined job status URL and executed process definition.
"""
# pylint: disable=W0231,W0233 # FIXME: tmp until patched

def __init__(self, wps_request, uuid, process, job_url, settings, *_, **__):
# type: (WorkerRequest, str, ProcessWPS, str, SettingsType, Any, Any) -> None

# FIXME: https://github.com/geopython/pywps/pull/578
# temp patch, do what 'ExecuteResponse.__init__' does bypassing the problem super() call
WPSResponse.__init__(self, wps_request, uuid) # pylint: disable=W0231,W0233 # tmp until patched
self.process = process
self.outputs = {o.identifier: o for o in self.process.outputs}
# should be following call, but causes infinite recursion until above fix is applied
# super(WorkerExecuteResponse, self).__init__(wps_request, job_id, process=wps_process)
# --- end of patch ---
super(WorkerExecuteResponse, self).__init__(wps_request, uuid, process=process)

# extra setup
self.process._status_store = ReferenceStatusLocationStorage(job_url, settings)
Expand Down Expand Up @@ -346,12 +338,6 @@ def execute_job(self,
request_parser = wps_request._post_request_parser(wps_request.WPS.Execute().tag) # noqa: W0212
request_parser(xml_request) # parses the submitted inputs/outputs data and request parameters

# FIXME: patch erroneous WPS outputs mimeType as None handling until fixed
# (see: https://github.com/geopython/pywps/pull/623)
for out in wps_request.outputs.values():
if "mimetype" in out and out["mimetype"] is None:
out["mimetype"] = ""

# NOTE:
# Setting 'status = false' will disable async execution of 'pywps.app.Process.Process'
# but this is needed since this job is running within Celery worker already async
Expand Down

0 comments on commit 15a4f34

Please sign in to comment.