Merge pull request #267 from technige/1.7-upgrade-neobolt

[1.7.1] Upgrade neobolt to 1.7.1

Author: technige

neo4j/__init__.py

@@ -65,15 +65,15 @@
     ])
 
 
-from collections import deque, namedtuple, Mapping
+from collections import deque, namedtuple
 from functools import reduce
 from operator import xor as xor_operator
 from random import random
 from time import sleep
 from warnings import warn
 
 
-from .compat import perf_counter, urlparse, xstr
+from .compat import perf_counter, urlparse, xstr, Mapping
 from .config import *
 from .meta import version as __version__
 

neo4j/compat/__init__.py

@@ -121,6 +121,14 @@ def perf_counter():
         return nanoTime() / 1000000000
 
 
+# Using or importing the ABCs from 'collections' instead of from
+# 'collections.abc' is deprecated, and in 3.8 it will stop working
+try:
+    from collections.abc import Mapping
+except ImportError:
+    from collections import Mapping
+
+
 # The location of urlparse varies between Python 2 and 3
 try:
     from urllib.parse import urlparse, parse_qs

neo4j/types/graph.py

@@ -23,9 +23,7 @@
 """
 
 
-from collections import Mapping
-
-from neo4j.compat import xstr, deprecated
+from neo4j.compat import xstr, deprecated, Mapping
 
 
 __all__ = [

requirements.txt

@@ -1,2 +1,2 @@
-neobolt<2,>=1.7
+neobolt<2,>=1.7.2
 neotime<2,>=1.7.1

setup.py

@@ -30,7 +30,7 @@
 from neo4j.meta import package, version
 
 install_requires = [
-    "neobolt<2,>=1.7",
+    "neobolt<2,>=1.7.2",
     "neotime<2,>=1.7.1",
 ]
 classifiers = [

test/requirements.txt

@@ -1,4 +1,4 @@
-boltkit>=1.0.39
+boltkit
 coverage
 mock
 pytest

test/stub/scripts/broken_router.script

@@ -1,7 +1,7 @@
 !: AUTO INIT
 !: AUTO RESET
 
-C: RUN "CALL dbms.cluster.routing.getServers" {}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable({context})" {"context": {}}
    PULL_ALL
 S: FAILURE {"code": "Neo.DatabaseError.General.UnknownError", "message": "An unknown error occurred."}
    IGNORED

test/stub/scripts/non_router.script

@@ -1,7 +1,7 @@
 !: AUTO INIT
 !: AUTO RESET
 
-C: RUN "CALL dbms.cluster.routing.getServers" {}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable({context})" {"context": {}}
    PULL_ALL
 S: FAILURE {"code": "Neo.ClientError.Procedure.ProcedureNotFound", "message": "Not a router"}
    IGNORED

test/stub/scripts/return_1_four_times.script

@@ -7,19 +7,19 @@ S: SUCCESS {"fields": ["x"]}
    RECORD [1]
    SUCCESS {}
 
-C: RUN "RETURN $x" {"x": 1}
+C: RUN "" {"x": 1}
    PULL_ALL
 S: SUCCESS {"fields": ["x"]}
    RECORD [1]
    SUCCESS {}
 
-C: RUN "RETURN $x" {"x": 1}
+C: RUN "" {"x": 1}
    PULL_ALL
 S: SUCCESS {"fields": ["x"]}
    RECORD [1]
    SUCCESS {}
 
-C: RUN "RETURN $x" {"x": 1}
+C: RUN "" {"x": 1}
    PULL_ALL
 S: SUCCESS {"fields": ["x"]}
    RECORD [1]

test/stub/scripts/return_1_in_tx_twice.script

@@ -22,7 +22,7 @@ C: RUN "BEGIN" {"bookmark": "bookmark:1", "bookmarks": ["bookmark:1"]}
 S: SUCCESS {"fields": []}
    SUCCESS {}
 
-C: RUN "RETURN 1" {}
+C: RUN "" {}
    PULL_ALL
 S: SUCCESS {"fields": ["1"]}
    RECORD [1]