Update script for travis, pep8 fixes

Joohwan Oh · Joohwan Oh · commit b2239da8fa3a · 2015-01-17T15:58:41.000-05:00
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@ language: python
 python:
     - "2.7"
 before_install:
-    - "sh setup_arangodb_2.3.sh"
+    - "sh setup_arangodb_2.4.sh"
 install:
     - "pip install ."
 script: nosetests
diff --git a/arango/batch.py b/arango/batch.py
@@ -1,6 +1,4 @@
-import re
 import json
-import logging
 import inspect
 from urllib import urlencode
 
@@ -20,15 +18,14 @@ def execute_batch(self, requests):
         for content_id, request in enumerate(requests, start=1):
             try:
                 func, args, kwargs = request
-                argspec = inspect.getargspec(func)[0]
-            except TypeError, ValueError:
+            except (TypeError, ValueError):
                 raise BatchInvalidError(
                     "pos {}: malformed request".format(content_id)
                 )
             if "_batch" not in inspect.getargspec(func)[0]:
                 raise BatchInvalidError(
                     "pos {}: ArangoDB method '{}' does not support "
-                    "batch execution".format(content_id , func.__name__)
+                    "batch execution".format(content_id, func.__name__)
                 )
             kwargs["_batch"] = True
             res = func(*args, **kwargs)
@@ -40,7 +37,7 @@ def execute_batch(self, requests):
         res = self._api.post(
             "/_api/batch",
             headers={
-              "Content-Type": "multipart/form-data; boundary=XXXsubpartXXX"
+                "Content-Type": "multipart/form-data; boundary=XXXsubpartXXX"
             },
             data=data,
         )
diff --git a/arango/clients/base.py b/arango/clients/base.py
@@ -2,8 +2,6 @@
 
 from abc import ABCMeta, abstractmethod
 
-from arango.response import ArangoResponse
-
 
 class BaseArangoClient(object):
     """Base ArangoDB HTTP client."""
diff --git a/arango/collection.py b/arango/collection.py
@@ -2,7 +2,7 @@
 
 import json
 
-from arango.utils import camelify, uncamelify, filter_keys
+from arango.utils import camelify, uncamelify
 from arango.exceptions import *
 from arango.cursor import CursorFactory
 
diff --git a/arango/database.py b/arango/database.py
@@ -160,8 +160,8 @@ def execute_query(self, query, count=False, batch_size=None, ttl=None,
         :type batch_size: int
         :param ttl: time-to-live for the cursor (in seconds)
         :type ttl: int
-        :param bind_vars: key/value list of bind parameters
-        :type bind_vars: list
+        :param bind_vars: key-value pairs of bind parameters
+        :type bind_vars: dict
         :param full_count: whether or not to include count before last LIMIT
         :param max_plans: maximum number of plans the optimizer generates
         :type max_plans: None or int
diff --git a/arango/method.py b/arango/method.py
@@ -1,4 +1,5 @@
 
+
 # TODO Future implementation to replace the hacky _batch arguments
 class ArangoRequest(object):
 
@@ -16,10 +17,10 @@ def javascript(self, *args, **kwargs):
 
     def __call__(self, *args, **kwargs):
         request = self.request_info(*args, **kwargs)
-        method = getattr(self._api, request["method"])
+        http_method = getattr(self._api, request["method"])
         method_kwargs = {}
         for component in ["path", "params", "data", "headers"]:
             if component in request:
                 method_kwargs[component] = request[component]
-        endpoint = request["endpoint"]
-        return handle_response(http_method(**method_kwargs))
+        method_kwargs["endpoint"] = request["endpoint"]
+        return self.handle_response(http_method(**method_kwargs))
diff --git a/arango/tests/test_aql_functions.py b/arango/tests/test_aql_functions.py
@@ -5,12 +5,11 @@
 from arango import Arango
 from arango.exceptions import *
 from arango.tests.utils import (
-    get_next_col_name,
     get_next_db_name
 )
 
-class AQLFunctionManagementTest(unittest.TestCase):
 
+class AQLFunctionManagementTest(unittest.TestCase):
 
     def setUp(self):
         self.arango = Arango()
diff --git a/arango/tests/test_batch.py b/arango/tests/test_batch.py
@@ -8,6 +8,7 @@
     get_next_graph_name,
 )
 
+
 class BatchRequestTest(unittest.TestCase):
 
     def setUp(self):
@@ -28,8 +29,8 @@ def setUp(self):
         self.graph = self.db.add_graph(
             name=self.graph_name,
             edge_definitions=[{
-                "collection" : self.edge_col_name,
-                "from" : [self.vertex_col_name],
+                "collection": self.edge_col_name,
+                "from": [self.vertex_col_name],
                 "to": [self.vertex_col_name]
             }],
         )
diff --git a/arango/tests/test_document.py b/arango/tests/test_document.py
@@ -17,8 +17,8 @@ def setUp(self):
         self.arango = Arango()
         self.db_name = get_next_db_name(self.arango)
         self.db = self.arango.add_database(self.db_name)
-        self.col_name = get_next_col_name(self.arango)
-        self.col = self.arango.add_collection(self.col_name)
+        self.col_name = get_next_col_name(self.db)
+        self.col = self.db.add_collection(self.col_name)
         self.col.add_geo_index(["coord"])
         self.col.add_skiplist_index(["value"])
         self.col.add_fulltext_index(["text"])
@@ -199,8 +199,8 @@ def test_get_first_example(self):
         self.assertIn(
             strip_system_keys(self.col.get_first_example({"value": 1})),
             [
-                {"name": "test_doc_01", "value" :1},
-                {"name": "test_doc_02", "value" :1}
+                {"name": "test_doc_01", "value": 1},
+                {"name": "test_doc_02", "value": 1}
             ]
         )
 
@@ -213,7 +213,7 @@ def test_get_by_example(self):
         self.assertEqual(
             sorted(strip_system_keys(self.col.get_by_example({"value": 1}))),
             sorted([
-                {"name": "test_doc_01", "value" :1},
+                {"name": "test_doc_01", "value": 1},
                 {"name": "test_doc_02", "value": 1},
             ])
         )
@@ -296,10 +296,10 @@ def test_range(self):
 
     def test_near(self):
         self.col.bulk_import([
-             {"name": "test_doc_01", "coord": [1,1]},
-             {"name": "test_doc_02", "coord": [1,4]},
-             {"name": "test_doc_03", "coord": [4,1]},
-             {"name": "test_doc_03", "coord": [4,4]},
+            {"name": "test_doc_01", "coord": [1, 1]},
+            {"name": "test_doc_02", "coord": [1, 4]},
+            {"name": "test_doc_03", "coord": [4, 1]},
+            {"name": "test_doc_03", "coord": [4, 4]},
         ])
         self.assertEqual(
             strip_system_keys(
@@ -310,39 +310,16 @@ def test_near(self):
                 )
             ),
             [
-                {"name": "test_doc_01", "coord": [1,1]}
+                {"name": "test_doc_01", "coord": [1, 1]}
             ]
         )
 
-    # TODO enable when the endpoint is fixed
-    #def test_within(self):
-        #self.col.bulk_import([
-            #{"name": "test_doc_01", "coord": [1,1]},
-            #{"name": "test_doc_02", "coord": [1,4]},
-            #{"name": "test_doc_03", "coord": [4,1]},
-            #{"name": "test_doc_03", "coord": [4,4]},
-        #])
-        #self.assertEqual(
-            #strip_system_keys(
-                #self.col.within(
-                    #latitude=0,
-                    #longitude=0,
-                    #radius=3.5,
-                #)
-            #),
-            #[
-                #{"name": "test_doc_01", "coord": [1,1]},
-                #{"name": "test_doc_02", "coord": [1,4]},
-                #{"name": "test_doc_03", "coord": [4,1]},
-            #]
-        #)
-
     def test_fulltext(self):
         self.col.bulk_import([
-             {"name": "test_doc_01", "text": "Hello World!"},
-             {"name": "test_doc_02", "text": "foo"},
-             {"name": "test_doc_03", "text": "bar"},
-             {"name": "test_doc_03", "text": "baz"},
+            {"name": "test_doc_01", "text": "Hello World!"},
+            {"name": "test_doc_02", "text": "foo"},
+            {"name": "test_doc_03", "text": "bar"},
+            {"name": "test_doc_03", "text": "baz"},
         ])
         self.assertEqual(
             strip_system_keys(self.col.fulltext("text", "foo,|bar")),
diff --git a/arango/tests/test_index.py b/arango/tests/test_index.py
@@ -97,8 +97,8 @@ def test_add_geo_index_with_one_attr(self):
             ignore_null=False
         )
         self.assertEquals(
-             sorted(self.col.indexes.values()),
-             sorted([
+            sorted(self.col.indexes.values()),
+            sorted([
                 {
                     "type": "primary",
                     "fields": ["_key"],
@@ -123,8 +123,8 @@ def test_add_geo_index_with_two_attrs(self):
             ignore_null=False
         )
         self.assertEquals(
-             sorted(self.col.indexes.values()),
-             sorted([
+            sorted(self.col.indexes.values()),
+            sorted([
                 {
                     "type": "primary",
                     "fields": ["_key"],
@@ -158,8 +158,8 @@ def test_add_fulltext_index(self):
             min_length=10,
         )
         self.assertEquals(
-             sorted(self.col.indexes.values()),
-             sorted([
+            sorted(self.col.indexes.values()),
+            sorted([
                 {
                     "type": "primary",
                     "fields": ["_key"],
diff --git a/arango/tests/test_query.py b/arango/tests/test_query.py
@@ -9,6 +9,7 @@
     get_next_db_name
 )
 
+
 class ArangoDBQueryTest(unittest.TestCase):
 
     def setUp(self):
diff --git a/arango/tests/test_transaction.py b/arango/tests/test_transaction.py
@@ -5,21 +5,22 @@
 from arango.tests.utils import (
     get_next_db_name,
     get_next_col_name,
-    get_next_graph_name,
 )
 
+
 class BatchRequestTest(unittest.TestCase):
 
     def setUp(self):
         self.arango = Arango()
-        self.col_name01 = get_next_col_name(self.arango)
-        self.col01 = self.arango.add_collection(self.col_name01)
-        self.col_name02 = get_next_col_name(self.arango)
-        self.col02 = self.arango.add_collection(self.col_name02)
+        self.db_name = get_next_db_name(self.arango)
+        self.db = self.arango.add_database(self.db_name)
+        self.col_name01 = get_next_col_name(self.db)
+        self.col01 = self.db.add_collection(self.col_name01)
+        self.col_name02 = get_next_col_name(self.db)
+        self.col02 = self.db.add_collection(self.col_name02)
 
     def tearDown(self):
-        self.arango.remove_collection(self.col_name01)
-        self.arango.remove_collection(self.col_name02)
+        self.arango.remove_database(self.db_name)
 
     def test_execute_transaction(self):
         action = """
@@ -31,7 +32,7 @@ def test_execute_transaction(self):
             }
         """ % (self.col_name01, self.col_name02)
 
-        res = self.arango.execute_transaction(
+        res = self.db.execute_transaction(
             action=action,
             read_collections=[self.col_name01, self.col_name02],
             write_collections=[self.col_name01, self.col_name02],
diff --git a/arango/tests/test_traversal.py b/arango/tests/test_traversal.py
@@ -9,6 +9,7 @@
     get_next_db_name
 )
 
+
 # TODO add more tests
 class EdgeManagementTest(unittest.TestCase):
 
diff --git a/arango/tests/test_vertex.py b/arango/tests/test_vertex.py
@@ -3,13 +3,13 @@
 import unittest
 
 from arango import Arango
-from arango.exceptions import *
 from arango.tests.utils import (
     get_next_graph_name,
     get_next_col_name,
     get_next_db_name
 )
 
+
 class VertexManagementTest(unittest.TestCase):
 
     def setUp(self):
@@ -31,8 +31,8 @@ def setUp(self):
         self.graph = self.db.add_graph(
             name=self.graph_name,
             edge_definitions=[{
-                "collection" : self.edge_col_name,
-                "from" : [self.vertex_col_name],
+                "collection": self.edge_col_name,
+                "from": [self.vertex_col_name],
                 "to": [self.vertex_col_name]
             }],
         )
@@ -109,6 +109,5 @@ def test_remove_vertex(self):
         self.assertEqual(len(self.vertex_col), 0)
 
 
-
 if __name__ == "__main__":
     unittest.main()
diff --git a/setup_arangodb_2.4.sh b/setup_arangodb_2.4.sh
@@ -0,0 +1,55 @@
+#!/bin/bash
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+cd $DIR
+
+VERSION=2.4.0
+NAME=ArangoDB-$VERSION
+
+if [ ! -d "$DIR/$NAME" ]; then
+  # download ArangoDB
+  echo "wget http://www.arangodb.org/repositories/travisCI/$NAME.tar.gz"
+  wget http://www.arangodb.org/repositories/travisCI/$NAME.tar.gz
+  echo "tar zxf $NAME.tar.gz"
+  tar zvxf $NAME.tar.gz
+fi
+
+ARCH=$(arch)
+PID=$(echo $PPID)
+TMP_DIR="/tmp/arangodb.$PID"
+PID_FILE="/tmp/arangodb.$PID.pid"
+ARANGODB_DIR="$DIR/$NAME"
+ARANGOD="${ARANGODB_DIR}/bin/arangod_x86_64"
+
+# create database directory
+mkdir ${TMP_DIR}
+
+echo "Starting ArangoDB '${ARANGOD}'"
+
+${ARANGOD} \
+    --database.directory ${TMP_DIR} \
+    --configuration none \
+    --server.endpoint tcp://127.0.0.1:8529 \
+    --javascript.app-path ${ARANGODB_DIR}/js/apps \
+    --javascript.startup-directory ${ARANGODB_DIR}/js \
+    --database.maximal-journal-size 1048576 \
+    --server.disable-authentication true &
+
+sleep 2
+
+echo "Check for arangod process"
+process=$(ps auxww | grep "bin/arangod" | grep -v grep)
+
+if [ "x$process" == "x" ]; then
+  echo "no 'arangod' process found"
+  echo "ARCH = $ARCH"
+  exit 1
+fi
+
+echo "Waiting until ArangoDB is ready on port 8529"
+while [[ -z `curl -s 'http://127.0.0.1:8529/_api/version' ` ]] ; do
+  echo -n "."
+  sleep 2s
+done
+
+echo "ArangoDB is up"

Original file line number	Diff line number	Diff line change
`@@ -97,8 +97,8 @@ def test_add_geo_index_with_one_attr(self):`
`97`	`97`	`ignore_null=False`
`98`	`98`	`)`
`99`	`99`	`self.assertEquals(`
`100`		`- sorted(self.col.indexes.values()),`
`101`		`- sorted([`
	`100`	`+ sorted(self.col.indexes.values()),`
	`101`	`+ sorted([`
`102`	`102`	`{`
`103`	`103`	`"type": "primary",`
`104`	`104`	`"fields": ["_key"],`
`@@ -123,8 +123,8 @@ def test_add_geo_index_with_two_attrs(self):`
`123`	`123`	`ignore_null=False`
`124`	`124`	`)`
`125`	`125`	`self.assertEquals(`
`126`		`- sorted(self.col.indexes.values()),`
`127`		`- sorted([`
	`126`	`+ sorted(self.col.indexes.values()),`
	`127`	`+ sorted([`
`128`	`128`	`{`
`129`	`129`	`"type": "primary",`
`130`	`130`	`"fields": ["_key"],`
`@@ -158,8 +158,8 @@ def test_add_fulltext_index(self):`
`158`	`158`	`min_length=10,`
`159`	`159`	`)`
`160`	`160`	`self.assertEquals(`
`161`		`- sorted(self.col.indexes.values()),`
`162`		`- sorted([`
	`161`	`+ sorted(self.col.indexes.values()),`
	`162`	`+ sorted([`
`163`	`163`	`{`
`164`	`164`	`"type": "primary",`
`165`	`165`	`"fields": ["_key"],`