diff --git a/.travis.yml b/.travis.yml index f102f46a6..dab6e7b8f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ dist: trusty python: - "2.7" - - "3.4" + - "3.5" git: submodules: false diff --git a/pywps/configuration.py b/pywps/configuration.py index cad668a8f..9e6d7ab3f 100755 --- a/pywps/configuration.py +++ b/pywps/configuration.py @@ -90,7 +90,7 @@ def load_configuration(cfgfiles=None): config.set('server', 'encoding', 'utf-8') config.set('server', 'language', 'en-US') config.set('server', 'url', 'http://localhost/wps') - config.set('server', 'maxoperations', '30') + config.set('server', 'maxprocesses', '30') config.set('server', 'maxsingleinputsize', '1mb') config.set('server', 'maxrequestsize', '3mb') config.set('server', 'temp_path', tempfile.gettempdir()) diff --git a/pywps/inout/inputs.py b/pywps/inout/inputs.py index eae5a5802..b894aa307 100644 --- a/pywps/inout/inputs.py +++ b/pywps/inout/inputs.py @@ -362,7 +362,7 @@ def _execute_xml_data(self): """Return Data node """ doc = WPS.Data() - literal_doc = WPS.LiteralData(self.data) + literal_doc = WPS.LiteralData(str(self.data)) if self.data_type: literal_doc.attrib['dataType'] = self.data_type diff --git a/tox.ini b/tox.ini index 36d07aec5..e48692def 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist=py27,py34 +envlist=py27,py35 [testenv:py27] deps = flufl.enum