[pywps] 02/16: Merge tag 'upstream/4.0.0_beta1' into experimental

Bas Couwenberg sebastic at debian.org
Mon Aug 22 21:44:54 UTC 2016


This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch experimental
in repository pywps.

commit cfa773813fea3e3b1a36a775209b8d7a8ad4daa5
Merge: d1a2e78 9c82d99
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jul 22 01:04:59 2016 +0200

    Merge tag 'upstream/4.0.0_beta1' into experimental
    
    Upstream version 4.0.0~beta1
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/copyright
    	debian/pywps.1
    	debian/pywps.links

 .github/ISSUE_TEMPLATE.md                          |    21 +
 .github/PULL_REQUEST_TEMPLATE.md                   |    12 +
 .gitignore                                         |    18 +
 .travis.yml                                        |    46 +
 AUTHORS                                            |    27 -
 CONTRIBUTING.rst                                   |   188 +
 CONTRIBUTORS.md                                    |     9 +
 ChangeLog                                          |   114 -
 INSTALL                                            |     8 -
 INSTALL.md                                         |    44 +
 LICENSE                                            |   280 -
 LICENSE.txt                                        |    19 +
 MANIFEST.in                                        |    34 +-
 README                                             |     7 -
 README.md                                          |    98 +
 RELEASE.howto                                      |    67 -
 SUBMITTING                                         |    55 -
 TODO                                               |     7 -
 VERSION.txt                                        |     1 +
 debian/copyright                                   |    26 +-
 default-sample.cfg                                 |    40 +
 doc/Makefile                                       |    89 -
 doc/README                                         |    14 -
 doc/make.bat                                       |   112 -
 doc/source/_static/pywps.png                       |   Bin 3139 -> 0 bytes
 doc/source/_templates/layout.html                  |   153 -
 doc/source/api/Exceptions.rst                      |     4 -
 doc/source/api/Grass.rst                           |     4 -
 doc/source/api/Parser/DescribeProcess.rst          |    13 -
 doc/source/api/Parser/Execute.rst                  |    13 -
 doc/source/api/Parser/GetCapabilities.rst          |    13 -
 doc/source/api/Parser/index.rst                    |    30 -
 doc/source/api/Process/InAndOutputs.rst            |    44 -
 doc/source/api/Process/Lang.rst                    |     9 -
 doc/source/api/Process/index.rst                   |    20 -
 doc/source/api/Soap.rst                            |     4 -
 doc/source/api/Template.rst                        |     2 -
 doc/source/api/Wps/DescribeProcess.rst             |     8 -
 doc/source/api/Wps/Execute.rst                     |     8 -
 doc/source/api/Wps/GetCapabilities.rst             |     8 -
 doc/source/api/Wps/index.rst                       |    16 -
 doc/source/api/index.rst                           |    20 -
 doc/source/clients/index.rst                       |    12 -
 doc/source/clients/javascript.rst                  |   212 -
 doc/source/conf.py                                 |   200 -
 doc/source/configuration/index.rst                 |   411 -
 doc/source/index.rst                               |    34 -
 doc/source/installation/index.rst                  |   132 -
 doc/source/process/execute.rst                     |    43 -
 doc/source/process/index.rst                       |    51 -
 doc/source/process/puts.rst                        |   171 -
 doc/source/process/structure.rst                   |    35 -
 doc/source/special/grass.rst                       |    90 -
 doc/source/special/index.rst                       |    17 -
 doc/source/special/mapserver.rst                   |    41 -
 doc/source/special/mod_python.rst                  |     2 -
 doc/source/special/wsgi.rst                        |    18 -
 doc/source/testing/index.rst                       |   161 -
 docs/Makefile                                      |    42 +
 docs/api.rst                                       |    50 +
 docs/conf.py                                       |    76 +
 docs/configuration.rst                             |   110 +
 docs/exceptions.rst                                |    27 +
 docs/index.rst                                     |    38 +
 docs/install.rst                                   |    62 +
 docs/max_operations.dia                            |   Bin 0 -> 4783 bytes
 docs/migration.rst                                 |     5 +
 docs/process.rst                                   |   219 +
 docs/pywps.png                                     |   Bin 0 -> 30115 bytes
 pywps/Exceptions.py                                |   165 -
 pywps/Ftp.py                                       |    49 -
 pywps/Grass.py                                     |   187 -
 pywps/Parser/DescribeProcess.py                    |   112 -
 pywps/Parser/Execute.py                            |   607 -
 pywps/Parser/Get.py                                |   188 -
 pywps/Parser/GetCapabilities.py                    |   126 -
 pywps/Parser/Post.py                               |   238 -
 pywps/Parser/__init__.py                           |    74 -
 pywps/Process/InAndOutputs.py                      |  1147 -
 pywps/Process/Lang.py                              |   118 -
 pywps/Process/Process.py                           |     7 -
 pywps/Process/__init__.py                          |   700 -
 pywps/Soap.py                                      |   407 -
 pywps/Template.py                                  |   704 -
 pywps/Templates/1_0_0/DescribeProcess.tmpl         |    91 -
 pywps/Templates/1_0_0/Execute.tmpl                 |   125 -
 pywps/Templates/1_0_0/GetCapabilities.tmpl         |   137 -
 .../inc/DescribeProcess_BoundingBoxValue.tmpl      |     8 -
 .../1_0_0/inc/DescribeProcess_ComplexValue.tmpl    |    24 -
 .../1_0_0/inc/DescribeProcess_LiteralValue.tmpl    |    43 -
 pywps/Templates/1_0_0/inc/Execute_Data_Inputs.tmpl |    16 -
 .../Templates/1_0_0/inc/Execute_Data_Outputs.tmpl  |    18 -
 pywps/Wps/DescribeProcess.py                       |   280 -
 pywps/Wps/Execute/UMN.py                           |   363 -
 pywps/Wps/Execute/__init__.py                      |  1517 --
 pywps/Wps/GetCapabilities.py                       |   184 -
 pywps/Wps/Wsdl.py                                  |   103 -
 pywps/Wps/__init__.py                              |   408 -
 pywps/XSLT/SOAP2WPS.xsl                            |   173 -
 pywps/XSLT/WPS2SOAP.xsl                            |    88 -
 pywps/XSLT/describeProcess2WSDL.xsl                |   825 -
 pywps/__init__.py                                  |   381 +-
 pywps/_compat.py                                   |    52 +
 pywps/app/Process.py                               |   394 +
 pywps/app/Service.py                               |   651 +
 pywps/app/WPSRequest.py                            |   639 +
 pywps/app/WPSResponse.py                           |   205 +
 pywps/app/__init__.py                              |     6 +
 pywps/app/basic.py                                 |    21 +
 pywps/config.py                                    |   129 -
 pywps/configuration.py                             |   226 +
 pywps/dblog.py                                     |   283 +
 pywps/default.cfg                                  |    53 -
 pywps/dependencies.py                              |    30 +
 pywps/etc/pywps.cfg-template                       |    46 -
 pywps/exceptions.py                                |   159 +
 pywps/inout/__init__.py                            |     4 +
 pywps/inout/basic.py                               |   617 +
 pywps/inout/formats/__init__.py                    |   197 +
 pywps/inout/formats/lists.py                       |    30 +
 pywps/inout/inputs.py                              |   377 +
 pywps/inout/literaltypes.py                        |   314 +
 pywps/inout/outputs.py                             |   284 +
 pywps/inout/storage.py                             |   130 +
 pywps/processes/README                             |    46 -
 pywps/processes/__init__.py                        |     1 -
 pywps/processes/dummyprocess.py                    |    35 -
 pywps/processes/moreInOne.py                       |    40 -
 pywps/processes/moreInstancesInOne.py              |     9 -
 pywps/processes/tests.py                           |   138 -
 pywps/processes/ultimatequestionprocess.py         |    41 -
 pywps/{Templates/1_0_0 => resources}/__init__.py   |     0
 .../1_0_0/inc => resources/schemas}/__init__.py    |     0
 pywps/resources/schemas/wps_all.xsd                |     4 +
 pywps/response.py                                  |   128 -
 pywps/schemas/geojson/README                       |     1 +
 pywps/schemas/geojson/bbox.json                    |     8 +
 pywps/schemas/geojson/crs.json                     |    54 +
 pywps/schemas/geojson/geojson.json                 |    61 +
 pywps/schemas/geojson/geometry.json                |    91 +
 pywps/validator/__init__.py                        |    45 +
 pywps/validator/allowed_value.py                   |    13 +
 pywps/validator/base.py                            |    12 +
 pywps/validator/complexvalidator.py                |   263 +
 pywps/validator/literalvalidator.py                |   112 +
 pywps/validator/mode.py                            |    10 +
 pywps/wpsserver.py                                 |    54 +
 requirements-dev.txt                               |     2 +
 requirements-gdal.txt                              |     1 +
 requirements-py2.txt                               |     1 +
 requirements.txt                                   |     6 +-
 rpm/pywps.changes                                  |    21 -
 rpm/pywps.spec                                     |    54 -
 setup.py                                           |   198 +-
 tests/Templates/1_0_0/DescribeProcess.tmpl         |    91 -
 tests/Templates/1_0_0/Execute.tmpl                 |   125 -
 tests/Templates/1_0_0/GetCapabilities.tmpl         |   137 -
 tests/Templates/1_0_0/GetCapabilities.tmplc        |   Bin 14595 -> 0 bytes
 tests/Templates/1_0_0/Wsdl.tmpl                    |   135 -
 tests/Templates/1_0_0/__init__.py                  |     0
 .../inc/DescribeProcess_BoundingBoxValue.tmpl      |     8 -
 .../1_0_0/inc/DescribeProcess_ComplexValue.tmpl    |    24 -
 .../1_0_0/inc/DescribeProcess_LiteralValue.tmpl    |    43 -
 tests/Templates/1_0_0/inc/Execute_Data_Inputs.tmpl |    16 -
 .../Templates/1_0_0/inc/Execute_Data_Outputs.tmpl  |    18 -
 tests/Templates/1_0_0/inc/__init__.py              |     0
 tests/Templates/__init__.py                        |     0
 tests/__init__.py                                  |    39 +
 tests/benchmark.py                                 |   108 -
 tests/common.py                                    |    70 +
 tests/{datainputs => data/geotiff}/dem.tiff        |   Bin
 tests/data/gml/point.gfs                           |    14 +
 tests/data/gml/point.gml                           |    19 +
 tests/data/json/point.geojson                      |     1 +
 tests/data/point.xsd                               |    30 +
 tests/data/shp/point.dbf                           |   Bin 0 -> 76 bytes
 tests/data/shp/point.prj                           |     1 +
 tests/data/shp/point.qpj                           |     1 +
 tests/data/shp/point.shp                           |   Bin 0 -> 128 bytes
 tests/data/shp/point.shp.zip                       |   Bin 0 -> 1067 bytes
 tests/data/shp/point.shx                           |   Bin 0 -> 108 bytes
 tests/datainputs/dem.base64                        |  7024 ------
 tests/datainputs/lakes.gfs                         |    29 -
 tests/datainputs/lakes.gml                         |   133 -
 tests/envvars_tests.py                             |    51 -
 tests/exception.py                                 |    79 -
 tests/exceptions.py                                |   109 -
 tests/parser.py                                    |   221 -
 tests/perform_requests.py                          |   873 -
 tests/process.py                                   |    47 +
 tests/process_inits.py                             |    68 -
 tests/processes/__init__.py                        |     7 +-
 tests/processes/buffer.py                          |    86 -
 tests/processes/dummyprocess.py                    |    32 -
 tests/processes/moreInOne.py                       |    36 -
 tests/processes/moreInstancesInOne.py              |     7 -
 tests/processes/returner.py                        |    45 -
 tests/processes/tests.py                           |   271 -
 tests/processes/ultimatequestionprocess.py         |    40 -
 tests/requests/HTTP_GET.txt                        |    35 -
 {pywps/Templates => tests/requests}/__init__.py    |     0
 .../wps_describeprocess_exception_SOAP11.xml       |    13 -
 .../wps_describeprocess_exception_SOAP12.xml       |    15 -
 tests/requests/wps_describeprocess_request.xml     |    26 +-
 .../wps_describeprocess_request_SOAP11RPC.xml      |     9 -
 tests/requests/wps_describeprocess_request_all.xml |     8 -
 .../wps_describeprocess_request_all_SOAP.xml       |    13 -
 .../wps_describeprocess_request_dummyprocess.xml   |     8 -
 tests/requests/wps_execute_request-base64.xml      | 24507 -------------------
 tests/requests/wps_execute_request-bbox.xml        |    16 -
 tests/requests/wps_execute_request-boundingbox.xml |    16 +
 ...s_execute_request-complexinput-as-reference.xml |    16 -
 ..._request-complexinput-direct-rawdata-output.xml |  7179 ------
 .../wps_execute_request-complexinput-direct.xml    |  7175 ------
 ...equest-complexinput-one-output-as-reference.xml |    28 -
 ...te_request-complexinput-output-as-reference.xml |    26 -
 .../requests/wps_execute_request-complexvalue.xml  |    47 +
 ...ecute_request-literalinput-responsedocument.xml |    57 -
 .../requests/wps_execute_request-literalinput.xml  |    44 -
 tests/requests/wps_execute_request-noinputs.xml    |    12 -
 .../requests/wps_execute_request-rawdataoutput.xml |    35 -
 .../wps_execute_request-responsedocument-1.xml     |    43 +
 .../wps_execute_request-responsedocument-2.xml     |    46 +
 .../wps_execute_request-responsedocument.xml       |    40 -
 .../requests/wps_execute_request_compress_SOAP.xml |    14 -
 ...s_execute_request_extended-responsedocument.xml |    66 +
 .../wps_execute_request_flags_compress_SOAP.xml    |    26 -
 tests/requests/wps_execute_request_lineage.xml     |   115 -
 .../requests/wps_execute_request_rawdataoutput.xml |    40 +
 .../wps_execute_request_reference_lineage.xml      |    41 -
 .../wps_execute_request_ultimate_compress_SOAP.xml |     9 -
 .../wps_execute_request_ultimatequestion_SOAP.xml  |    15 -
 tests/requests/wps_getcapabilities_request.xml     |    15 +-
 .../wps_getcapabilities_request_SOAP11.xml         |    28 -
 .../wps_getcapabilities_request_SOAP11RPC.xml      |    16 -
 .../wps_getcapabilities_request_SOAP12.xml         |    24 -
 tests/schema_validation.py                         |   351 -
 tests/soap_tests.py                                |   405 -
 tests/test_assync.py                               |    58 +
 tests/test_capabilities.py                         |    99 +
 tests/test_dblog.py                                |    51 +
 tests/test_describe.py                             |   275 +
 tests/test_exceptions.py                           |    47 +
 tests/test_execute.py                              |   370 +
 tests/test_formats.py                              |   108 +
 tests/test_inout.py                                |   341 +
 tests/test_literaltypes.py                         |    47 +
 tests/test_ows.py                                  |   160 +
 tests/test_wpsrequest.py                           |    66 +
 {pywps/XSLT => tests/validator}/__init__.py        |     0
 tests/validator/test_complexvalidators.py          |   115 +
 tests/validator/test_literalvalidators.py          |   115 +
 tox.ini                                            |    24 +
 webclient/01-init.html                             |    66 -
 webclient/02-describe.html                         |    75 -
 webclient/03-execute.html                          |    80 -
 webclient/04-execute-automatic.html                |    78 -
 webclient/WPS.js                                   |  1410 --
 webservices/cgi/pywps.cgi                          |    14 -
 webservices/mod_python/.htaccess                   |     7 -
 webservices/mod_python/wps.py                      |    83 -
 webservices/tomcat/PywpsServlet.py                 |    61 -
 webservices/tomcat/web.xml                         |    45 -
 webservices/wsgi/wsgiwps.py                        |    86 -
 wps.py                                             |   101 -
 wsgi/pywps.wsgi                                    |    26 +
 266 files changed, 9087 insertions(+), 65411 deletions(-)

diff --cc debian/copyright
index 0f425bf,e695206..70ad996
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,31 -1,26 +1,53 @@@
  Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 -Source: https://github.com/geopython/pywps
 +Upstream-Name: PyWPS
 +Upstream-Contact: PyWPS Development Team <pywps-dev at lists.osgeo.org>
 +Source: https://github.com/geopython/pywps/releases
  
  Files: *
- Copyright: 2006, 2009, Jáchym Čepický
- License: GPL-2+
 -Copyright: Copyright 2014-2016 PyWPS Development Team, represented by Jachym Cepicky
++Copyright: 2014-2016, PyWPS Development Team, represented by Jachym Cepicky
++License: Expat
 +
 +Files: debian/*
 +Copyright: 2006, Jáchym Čepický <jachym at les-ejk.cz>
 +License: GPL-2+
 +
 +License: GPL-2+
 + This program is free software; you can redistribute it and/or modify
 + it under the terms of the GNU General Public License as published by
 + the Free Software Foundation; either version 2 of the License, or
 + (at your option) any later version.
 + .
 + This program is distributed in the hope that it will be useful,
 + but WITHOUT ANY WARRANTY; without even the implied warranty of
 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 + GNU General Public License for more details.
 + .
 + You should have received a copy of the GNU General Public License along
 + with this program; if not, write to the Free Software Foundation, Inc.,
 + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 + .
 + On Debian systems, the complete text of version 2 of the GNU General
 + Public License can be found in `/usr/share/common-licenses/GPL-2'.
 +
+ License: Expat
+  Permission is hereby granted, free of charge, to any person
 - obtaining a copy of this software and associated documentation 
 - files (the "Software"), to deal in the Software without 
++ obtaining a copy of this software and associated documentation
++ files (the "Software"), to deal in the Software without
+  restriction, including without limitation the rights to use,
+  copy, modify, merge, publish, distribute, sublicense, and/or
 - sell copies of the Software, and to permit persons to whom 
++ sell copies of the Software, and to permit persons to whom
+  the Software is furnished to do so, subject to the following
+  conditions:
+  .
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+  .
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+  OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+  HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
 - WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
++ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+  OTHER DEALINGS IN THE SOFTWARE.
++

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pywps.git



More information about the Pkg-grass-devel mailing list