Skip to content

Commit 8c87f61

Browse files
committed
Add changes for ArangoDB 3.6 and add multipart encoder for Foxx
1 parent a5d2299 commit 8c87f61

26 files changed

+733
-106
lines changed

.travis.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ language: python
33
matrix:
44
include:
55
- python: 2.7
6-
- python: 3.4
76
- python: 3.5
87
- python: 3.6
98
- python: 3.7
@@ -12,7 +11,7 @@ matrix:
1211
services:
1312
- docker
1413
before_install:
15-
- docker run --name arango -d -p 8529:8529 -e ARANGO_ROOT_PASSWORD=passwd arangodb/arangodb:3.5.0
14+
- docker run --name arango -d -p 8529:8529 -e ARANGO_ROOT_PASSWORD=passwd arangodb/arangodb:3.6.1
1615
- docker cp tests/static/service.zip arango:/tmp/service.zip
1716
install:
1817
- pip install flake8 mock

README.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
:target: https://badge.fury.io/py/python-arango
1515
:alt: Package Version
1616

17-
.. image:: https://img.shields.io/badge/python-2.7%2C%203.4%2C%203.5%2C%203.6%2C%203.7-blue.svg
17+
.. image:: https://img.shields.io/badge/python-2.7%2C%203.5%2C%203.6%2C%203.7-blue.svg
1818
:target: https://github.com/joowani/python-arango
1919
:alt: Python Versions
2020

@@ -51,7 +51,7 @@ Features
5151
Compatibility
5252
=============
5353

54-
- Python versions 2.7, 3.4, 3.5, 3.6 and 3.7 are supported
54+
- Python versions 2.7, 3.5, 3.6 and 3.7 are supported
5555
- Python-arango 5.x supports ArangoDB 3.5+
5656
- Python-arango 4.x supports ArangoDB 3.3 ~ 3.4 only
5757
- Python-arango 3.x supports ArangoDB 3.0 ~ 3.2 only

arango/aql.py

+8-1
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,8 @@ def execute(self,
140140
read_collections=None,
141141
write_collections=None,
142142
stream=None,
143-
skip_inaccessible_cols=None):
143+
skip_inaccessible_cols=None,
144+
max_runtime=None):
144145
"""Execute the query and return the result cursor.
145146
146147
:param query: Query to execute.
@@ -228,6 +229,10 @@ def execute(self,
228229
available only for enterprise version of ArangoDB. Default value is
229230
False.
230231
:type skip_inaccessible_cols: bool
232+
:param max_runtime: Query must be executed within this given timeout or
233+
it is killed. The value is specified in seconds. Default value
234+
is 0.0 (no timeout).
235+
:type max_runtime: int | float
231236
:return: Result cursor.
232237
:rtype: arango.cursor.Cursor
233238
:raise arango.exceptions.AQLQueryExecuteError: If execute fails.
@@ -269,6 +274,8 @@ def execute(self,
269274
options['stream'] = stream
270275
if skip_inaccessible_cols is not None:
271276
options['skipInaccessibleCollections'] = skip_inaccessible_cols
277+
if max_runtime is not None:
278+
options['maxRuntime'] = max_runtime
272279

273280
if options:
274281
data['options'] = options

0 commit comments

Comments
 (0)