Lionfish

graph_workers/spidercrab.py

@@ -15,15 +15,14 @@
 import uuid
 ### TODO: this line shouldn't be here (it worked on Konrad's laptop?) adding toquickly test
 sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
-sys.path.append(os.path.join(os.path.dirname(__file__), '../lionfish'))
+sys.path.append(os.path.join(os.path.dirname(__file__), '../lionfish/python_lionfish/client/'))
 from don_corleone import don_utils as du
 
 from graph_workers.graph_defines import *
 from graph_workers.graph_utils import *
 from graph_workers.graph_worker import GraphWorker
 from graph_workers.privileges import construct_full_privilege
-import python_lionfish
-from python_lionfish.client import Client 
+from client import Client
 
 # Defining levels to get rid of other loggers
 info_level = 100
@@ -129,7 +128,7 @@ def __init__(
 
         self.required_privileges = construct_full_privilege()
         # TODO: use configuration!
-	self.odm_client = Client('localhost', 7777)
+        self.odm_client = Client('localhost', 7777)
         self.terminate_event = threading.Event()
         self.runtime_id = runtime_id
         self.master_sources_urls_file = master_sources_urls_file
@@ -387,7 +386,7 @@ def _check_and_init_db(self):
                 info_level,
                 'Spidercrab model not found in the database. Creating...'
             )
-            self.odm_client.create_model('Spidercrab')
+            self.odm_client.create_model_node('Spidercrab')
             self.logger.log(
                 info_level,
                 'Spidercrab model created.'

lionfish/README.md

@@ -118,8 +118,8 @@ The table below applies to read methods: **_getChildren_**, **_getInstances_**
 #### Set 1.3
 
 The table below applies to write methods: **_setProperties_**, **_deleteProperties_**,
-**_createNode_**, **_deleteNode_**, **_deleteRelationship_**, **_setRelationshipProperties_**,
-**_deleteRelationshipProperties_**
+**_setRelationshipProperties_**, **_deleteRelationshipProperties_**, **_createNode_**,
+**_deleteNode_**, **_deleteRelationship_**, **_popRelationship_**
 
 | using batch | correct input |
 | :---------: | :-----------: |

lionfish/build.sbt

@@ -4,7 +4,7 @@ name := "lionfish"
 
 oneJarSettings
 
-version := "0.9.3"
+version := "0.9.5"
 
 scalaVersion := "2.10.4"
 
@@ -51,7 +51,7 @@ libraryDependencies += "org.neo4j.app" % "neo4j-server" % "2.0.3" classifier "st
 //libraryDependencies += "commons-beanutils" % "commons-beanutils-core" % "1.8.0"
 
 libraryDependencies ++= Seq(
-  "org.neo4j.app" % "neo4j-server" % "2.0.2"
+  "org.neo4j.app" % "neo4j-server" % "2.0.3"
 )
 
 libraryDependencies ++= Seq("com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.3.3")
@@ -63,4 +63,6 @@ libraryDependencies ++= Seq(
 
 libraryDependencies += "org.scalatest" % "scalatest_2.10" % "2.1.4" % "test"
 
+parallelExecution in Test := false
+
 libraryDependencies += "commons-lang" % "commons-lang" % "2.6"