[Git][debian-gis-team/pywps][experimental] 4 commits: New upstream version 4.4.2

Bas Couwenberg gitlab at salsa.debian.org
Wed Mar 31 19:20:41 BST 2021



Bas Couwenberg pushed to branch experimental at Debian GIS Project / pywps


Commits:
39fbbf64 by Bas Couwenberg at 2021-03-31T20:10:35+02:00
New upstream version 4.4.2
- - - - -
703b05b1 by Bas Couwenberg at 2021-03-31T20:10:37+02:00
Update upstream source from tag 'upstream/4.4.2'

Update to upstream version '4.4.2'
with Debian dir 14bd1230408a2560a0efdf5eccb96c220d9b5700
- - - - -
047bff54 by Bas Couwenberg at 2021-03-31T20:10:47+02:00
New upstream release.

- - - - -
ab96ab18 by Bas Couwenberg at 2021-03-31T20:12:25+02:00
Set distribution to experimental.

- - - - -


8 changed files:

- README.md
- VERSION.txt
- debian/changelog
- pywps/__init__.py
- pywps/inout/formats/__init__.py
- pywps/processing/scheduler.py
- pywps/response/execute.py
- setup.cfg


Changes:

=====================================
README.md
=====================================
@@ -4,10 +4,9 @@ PyWPS is an implementation of the Web Processing Service standard from
 the Open Geospatial Consortium. PyWPS is written in Python.
 
 [![Documentation Status](https://img.shields.io/badge/docs-latest-brightgreen.svg)](https://pywps.readthedocs.io/en/latest/?badge=latest)
-[![Build Status](https://travis-ci.org/geopython/pywps.png)](https://travis-ci.org/geopython/pywps)
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/19d53c45a3854e37b89523cf9bb1d262)](https://www.codacy.com/project/cehbrecht/pywps/dashboard?utm_source=github.com&utm_medium=referral&utm_content=geopython/pywps&utm_campaign=Badge_Grade_Dashboard)
+[![Build Status](https://github.com/geopython/pywps/actions/workflows/main.yml/badge.svg)](https://github.com/geopython/pywps/actions/workflows/main.yml)
 [![Coverage Status](https://coveralls.io/repos/github/geopython/pywps/badge.svg?branch=master)](https://coveralls.io/github/geopython/pywps?branch=master)
-[![PyPI](https://img.shields.io/pypi/dm/pywps.svg)]()
+[![PyPI](https://img.shields.io/pypi/dm/pywps.svg)](https://pypi.org/project/pywps/)
 [![GitHub license](https://img.shields.io/github/license/geopython/pywps.svg)]()
 
 [![Join the chat at https://gitter.im/geopython/pywps](https://badges.gitter.im/geopython/pywps.svg)](https://gitter.im/geopython/pywps?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)


=====================================
VERSION.txt
=====================================
@@ -1 +1 @@
-4.4.1
+4.4.2


=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+pywps (4.4.2-1~exp1) experimental; urgency=medium
+
+  * New upstream release.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Wed, 31 Mar 2021 20:12:04 +0200
+
 pywps (4.4.1-1~exp1) experimental; urgency=medium
 
   * New upstream release.


=====================================
pywps/__init__.py
=====================================
@@ -9,7 +9,7 @@ import os
 
 from lxml.builder import ElementMaker
 
-__version__ = '4.4.0'
+__version__ = "4.4.2"
 
 LOGGER = logging.getLogger('PYWPS')
 LOGGER.debug('setting core variables')


=====================================
pywps/inout/formats/__init__.py
=====================================
@@ -19,7 +19,7 @@ _FORMATS = namedtuple('FORMATS', 'GEOJSON, JSON, SHP, GML, GPX, METALINK, META4,
                                  'WCS, WCS100, WCS110, WCS20, WFS, WFS100,'
                                  'WFS110, WFS20, WMS, WMS130, WMS110,'
                                  'WMS100, TEXT, DODS, NETCDF, NCML, LAZ, LAS, ZIP,'
-                                 'XML')
+                                 'XML, CSV')
 
 
 class Format(object):
@@ -193,6 +193,7 @@ FORMATS = _FORMATS(
     Format('application/octet-stream', extension='.las'),
     Format('application/zip', extension='.zip', encoding='base64'),
     Format('application/xml', extension='.xml'),
+    Format('text/csv', extension='.csv'),
 )
 
 


=====================================
pywps/processing/scheduler.py
=====================================
@@ -61,8 +61,6 @@ class Scheduler(Processing):
                 jobid = session.runJob(jt)
                 LOGGER.info('Your job has been submitted with ID {}'.format(jobid))
                 # show status
-                import time
-                time.sleep(1)
                 LOGGER.info('Job status: {}'.format(session.jobStatus(jobid)))
                 # Cleaning up
                 session.deleteJobTemplate(jt)


=====================================
pywps/response/execute.py
=====================================
@@ -170,7 +170,10 @@ class ExecuteResponse(WPSResponse):
             data["status"] = self._process_paused()
         elif self.status == WPS_STATUS.SUCCEEDED:
             data["status"] = self._process_succeeded()
-
+            # Process outputs XML
+            data["outputs"] = [self.outputs[o].json for o in self.outputs]
+        # lineage: add optional lineage when process has finished
+        if self.status in [WPS_STATUS.SUCCEEDED, WPS_STATUS.FAILED]:
             # DataInputs and DataOutputs definition XML if lineage=true
             if self.wps_request.lineage == 'true':
                 data["lineage"] = True
@@ -182,9 +185,6 @@ class ExecuteResponse(WPSResponse):
                     LOGGER.error("Failed to update lineage for input parameter. {}".format(e))
 
                 data["output_definitions"] = [self.outputs[o].json for o in self.outputs]
-
-            # Process outputs XML
-            data["outputs"] = [self.outputs[o].json for o in self.outputs]
         return data
 
     def _construct_doc(self):


=====================================
setup.cfg
=====================================
@@ -1,16 +1,16 @@
-[flake8]
-ignore=F401,E402,W606
-max-line-length=120
-exclude=tests
-
 [bumpversion]
-current_version = 4.4.0
+current_version = 4.4.2
 commit = False
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+).(?P<patch>\d+)
-serialize =
+serialize = 
 	{major}.{minor}.{patch}
 
+[flake8]
+ignore = F401,E402,W606
+max-line-length = 120
+exclude = tests
+
 [bumpversion:file:pywps/__init__.py]
 search = __version__ = "{current_version}"
 replace = __version__ = "{new_version}"



View it on GitLab: https://salsa.debian.org/debian-gis-team/pywps/-/compare/ae4fc8bc19bd51c5d12fca49aa4902c553e12640...ab96ab186f044b48d0b4354dbfbede1566d39587

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/pywps/-/compare/ae4fc8bc19bd51c5d12fca49aa4902c553e12640...ab96ab186f044b48d0b4354dbfbede1566d39587
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20210331/db355c3b/attachment-0001.htm>


More information about the Pkg-grass-devel mailing list