Skip to content

Commit

Permalink
Add changes for ArangoDB 3.6 and add multipart encoder for Foxx
Browse files Browse the repository at this point in the history
  • Loading branch information
joowani committed Feb 28, 2020
1 parent a5d2299 commit 8c87f61
Show file tree
Hide file tree
Showing 26 changed files with 733 additions and 106 deletions.
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ language: python
matrix:
include:
- python: 2.7
- python: 3.4
- python: 3.5
- python: 3.6
- python: 3.7
Expand All @@ -12,7 +11,7 @@ matrix:
services:
- docker
before_install:
- docker run --name arango -d -p 8529:8529 -e ARANGO_ROOT_PASSWORD=passwd arangodb/arangodb:3.5.0
- docker run --name arango -d -p 8529:8529 -e ARANGO_ROOT_PASSWORD=passwd arangodb/arangodb:3.6.1
- docker cp tests/static/service.zip arango:/tmp/service.zip
install:
- pip install flake8 mock
Expand Down
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
:target: https://badge.fury.io/py/python-arango
:alt: Package Version

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

Expand Down Expand Up @@ -51,7 +51,7 @@ Features
Compatibility
=============

- Python versions 2.7, 3.4, 3.5, 3.6 and 3.7 are supported
- Python versions 2.7, 3.5, 3.6 and 3.7 are supported
- Python-arango 5.x supports ArangoDB 3.5+
- Python-arango 4.x supports ArangoDB 3.3 ~ 3.4 only
- Python-arango 3.x supports ArangoDB 3.0 ~ 3.2 only
Expand Down
9 changes: 8 additions & 1 deletion arango/aql.py
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,8 @@ def execute(self,
read_collections=None,
write_collections=None,
stream=None,
skip_inaccessible_cols=None):
skip_inaccessible_cols=None,
max_runtime=None):
"""Execute the query and return the result cursor.
:param query: Query to execute.
Expand Down Expand Up @@ -228,6 +229,10 @@ def execute(self,
available only for enterprise version of ArangoDB. Default value is
False.
:type skip_inaccessible_cols: bool
:param max_runtime: Query must be executed within this given timeout or
it is killed. The value is specified in seconds. Default value
is 0.0 (no timeout).
:type max_runtime: int | float
:return: Result cursor.
:rtype: arango.cursor.Cursor
:raise arango.exceptions.AQLQueryExecuteError: If execute fails.
Expand Down Expand Up @@ -269,6 +274,8 @@ def execute(self,
options['stream'] = stream
if skip_inaccessible_cols is not None:
options['skipInaccessibleCollections'] = skip_inaccessible_cols
if max_runtime is not None:
options['maxRuntime'] = max_runtime

if options:
data['options'] = options
Expand Down
Loading

0 comments on commit 8c87f61

Please sign in to comment.