Fixed native mode examples (#247)

* Fixed native mode examples

* Install using --user in CI

* Only use --user on macos

* Remove quotes

Author: Axel Dahlberg

.travis.yml

@@ -18,10 +18,12 @@ matrix:
       os: osx
       osx_image: xcode10.2
       language: shell
+      env:
+      - PIPFLAG="--user"
 before_install:
   - make build
 install:
-  - pip3 install dist/*.whl
+  - pip3 install dist/*.whl $PIPFLAG
 script:
   - make lint
   - make tests

examples/nativeMode/corrRNG/aliceTest.py

@@ -28,11 +28,10 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import logging
-import os
 
 from simulaqron.local.setup import setup_local
 from simulaqron.general.hostConfig import socketsConfig
-from simulaqron.toolbox import get_simulaqron_path
+from simulaqron.settings import simulaqron_settings
 from twisted.internet.defer import inlineCallbacks
 from twisted.internet import reactor
 from twisted.spread import pb
@@ -120,14 +119,13 @@ def main():
     myName = "Alice"
 
     # This file defines the network of virtual quantum nodes
-    simulaqron_path = get_simulaqron_path.main()
-    virtualFile = os.path.join(simulaqron_path, "config/virtualNodes.cfg")
+    network_file = simulaqron_settings.network_config_file
 
     # This file defines the nodes acting as servers in the classical communication network
     classicalFile = "classicalNet.cfg"
 
     # Read configuration files for the virtual quantum, as well as the classical network
-    virtualNet = socketsConfig(virtualFile)
+    virtualNet = socketsConfig(network_file)
     classicalNet = socketsConfig(classicalFile)
 
     # Check if we should run a local classical server. If so, initialize the code

examples/nativeMode/corrRNG/bobTest.py

@@ -29,11 +29,10 @@
 
 
 import logging
-import os
 
 from simulaqron.local.setup import setup_local
 from simulaqron.general.hostConfig import socketsConfig
-from simulaqron.toolbox import get_simulaqron_path
+from simulaqron.settings import simulaqron_settings
 from twisted.internet.defer import inlineCallbacks
 from twisted.spread import pb
 
@@ -129,14 +128,13 @@ def main():
     myName = "Bob"
 
     # This file defines the network of virtual quantum nodes
-    simulaqron_path = get_simulaqron_path.main()
-    virtualFile = os.path.join(simulaqron_path, "config/virtualNodes.cfg")
+    network_file = simulaqron_settings.network_config_file
 
     # This file defines the nodes acting as servers in the classical communication network
     classicalFile = "classicalNet.cfg"
 
     # Read configuration files for the virtual quantum, as well as the classical network
-    virtualNet = socketsConfig(virtualFile)
+    virtualNet = socketsConfig(network_file)
     classicalNet = socketsConfig(classicalFile)
 
     # Check if we should run a local classical server. If so, initialize the code

examples/nativeMode/extendGHZ/aliceTest.py

@@ -27,12 +27,12 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import logging
 import os
+import logging
 
 from simulaqron.local.setup import setup_local
 from simulaqron.general.hostConfig import socketsConfig
-from simulaqron.toolbox import get_simulaqron_path
+from simulaqron.settings import simulaqron_settings
 from twisted.internet.defer import inlineCallbacks
 from twisted.spread import pb
 from twisted.internet import reactor
@@ -121,14 +121,13 @@ def main():
     myName = "Alice"
 
     # This file defines the network of virtual quantum nodes
-    simulaqron_path = get_simulaqron_path.main()
-    virtualFile = os.path.join(simulaqron_path, "config/virtualNodes.cfg")
+    network_file = simulaqron_settings.network_config_file
 
     # This file defines the nodes acting as servers in the classical communication network
     classicalFile = os.path.join(os.path.dirname(__file__), "classicalNet.cfg")
 
     # Read configuration files for the virtual quantum, as well as the classical network
-    virtualNet = socketsConfig(virtualFile)
+    virtualNet = socketsConfig(network_file)
     classicalNet = socketsConfig(classicalFile)
 
     # Check if we should run a local classical server. If so, initialize the code

examples/nativeMode/extendGHZ/bobTest.py

@@ -27,12 +27,12 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import logging
 import os
+import logging
 
 from simulaqron.local.setup import setup_local
 from simulaqron.general.hostConfig import socketsConfig
-from simulaqron.toolbox import get_simulaqron_path
+from simulaqron.settings import simulaqron_settings
 from twisted.internet.defer import inlineCallbacks
 from twisted.spread import pb
 
@@ -128,14 +128,13 @@ def main():
     myName = "Bob"
 
     # This file defines the network of virtual quantum nodes
-    simulaqron_path = get_simulaqron_path.main()
-    virtualFile = os.path.join(simulaqron_path, "config/virtualNodes.cfg")
+    network_file = simulaqron_settings.network_config_file
 
     # This file defines the nodes acting as servers in the classical communication network
     classicalFile = os.path.join(os.path.dirname(__file__), "classicalNet.cfg")
 
     # Read configuration files for the virtual quantum, as well as the classical network
-    virtualNet = socketsConfig(virtualFile)
+    virtualNet = socketsConfig(network_file)
     classicalNet = socketsConfig(classicalFile)
 
     # Check if we should run a local classical server. If so, initialize the code

examples/nativeMode/extendGHZ/charlieTest.py

@@ -27,12 +27,12 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import logging
 import os
+import logging
 
 from simulaqron.local.setup import setup_local
 from simulaqron.general.hostConfig import socketsConfig
-from simulaqron.toolbox import get_simulaqron_path
+from simulaqron.settings import simulaqron_settings
 from twisted.internet.defer import inlineCallbacks
 from twisted.spread import pb
 
@@ -114,14 +114,13 @@ def main():
     myName = "Charlie"
 
     # This file defines the network of virtual quantum nodes
-    simulaqron_path = get_simulaqron_path.main()
-    virtualFile = os.path.join(simulaqron_path, "config/virtualNodes.cfg")
+    network_file = simulaqron_settings.network_config_file
 
     # This file defines the nodes acting as servers in the classical communication network
     classicalFile = os.path.join(os.path.dirname(__file__), "classicalNet.cfg")
 
     # Read configuration files for the virtual quantum, as well as the classical network
-    virtualNet = socketsConfig(virtualFile)
+    virtualNet = socketsConfig(network_file)
     classicalNet = socketsConfig(classicalFile)
 
     # Check if we should run a local classical server. If so, initialize the code

examples/nativeMode/graphState/aliceTest.py

@@ -28,12 +28,12 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-import logging
 import os
+import logging
 
 from simulaqron.local.setup import setup_local
 from simulaqron.general.hostConfig import socketsConfig
-from simulaqron.toolbox import get_simulaqron_path
+from simulaqron.settings import simulaqron_settings
 from twisted.internet.defer import inlineCallbacks
 from twisted.spread import pb
 from twisted.internet import reactor
@@ -138,14 +138,13 @@ def main():
     myName = "Alice"
 
     # This file defines the network of virtual quantum nodes
-    simulaqron_path = get_simulaqron_path.main()
-    virtualFile = os.path.join(simulaqron_path, "config/virtualNodes.cfg")
+    network_file = simulaqron_settings.network_config_file
 
     # This file defines the nodes acting as servers in the classical communication network
     classicalFile = os.path.join(os.path.dirname(__file__), "classicalNet.cfg")
 
     # Read configuration files for the virtual quantum, as well as the classical network
-    virtualNet = socketsConfig(virtualFile)
+    virtualNet = socketsConfig(network_file)
     classicalNet = socketsConfig(classicalFile)
 
     # Check if we should run a local classical server. If so, initialize the code

examples/nativeMode/graphState/bobTest.py

@@ -28,14 +28,13 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-import logging
 import os
-
+import logging
 import numpy as np
 
 from simulaqron.local.setup import setup_local
 from simulaqron.general.hostConfig import socketsConfig
-from simulaqron.toolbox import get_simulaqron_path
+from simulaqron.settings import simulaqron_settings
 from twisted.internet.defer import inlineCallbacks
 from twisted.spread import pb
 
@@ -138,14 +137,13 @@ def main():
     myName = "Bob"
 
     # This file defines the network of virtual quantum nodes
-    simulaqron_path = get_simulaqron_path.main()
-    virtualFile = os.path.join(simulaqron_path, "config/virtualNodes.cfg")
+    network_file = simulaqron_settings.network_config_file
 
     # This file defines the nodes acting as servers in the classical communication network
     classicalFile = os.path.join(os.path.dirname(__file__), "classicalNet.cfg")
 
     # Read configuration files for the virtual quantum, as well as the classical network
-    virtualNet = socketsConfig(virtualFile)
+    virtualNet = socketsConfig(network_file)
     classicalNet = socketsConfig(classicalFile)
 
     # Check if we should run a local classical server. If so, initialize the code

examples/nativeMode/graphState/charlieTest.py

@@ -28,14 +28,13 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-import logging
 import os
-
+import logging
 import numpy as np
 
 from simulaqron.local.setup import setup_local
 from simulaqron.general.hostConfig import socketsConfig
-from simulaqron.toolbox import get_simulaqron_path
+from simulaqron.settings import simulaqron_settings
 from twisted.internet.defer import inlineCallbacks
 from twisted.spread import pb
 
@@ -169,14 +168,13 @@ def main():
     myName = "Charlie"
 
     # This file defines the network of virtual quantum nodes
-    simulaqron_path = get_simulaqron_path.main()
-    virtualFile = os.path.join(simulaqron_path, "config/virtualNodes.cfg")
+    network_file = simulaqron_settings.network_config_file
 
     # This file defines the nodes acting as servers in the classical communication network
     classicalFile = os.path.join(os.path.dirname(__file__), "classicalNet.cfg")
 
     # Read configuration files for the virtual quantum, as well as the classical network
-    virtualNet = socketsConfig(virtualFile)
+    virtualNet = socketsConfig(network_file)
     classicalNet = socketsConfig(classicalFile)
 
     # Check if we should run a local classical server. If so, initialize the code

examples/nativeMode/graphState/davidTest.py

@@ -28,14 +28,13 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-import logging
 import os
-
+import logging
 import numpy as np
 
 from simulaqron.local.setup import setup_local
 from simulaqron.general.hostConfig import socketsConfig
-from simulaqron.toolbox import get_simulaqron_path
+from simulaqron.settings import simulaqron_settings
 from twisted.internet.defer import inlineCallbacks
 from twisted.spread import pb
 
@@ -144,14 +143,13 @@ def main():
     myName = "David"
 
     # This file defines the network of virtual quantum nodes
-    simulaqron_path = get_simulaqron_path.main()
-    virtualFile = os.path.join(simulaqron_path, "config/virtualNodes.cfg")
+    network_file = simulaqron_settings.network_config_file
 
     # This file defines the nodes acting as servers in the classical communication network
     classicalFile = os.path.join(os.path.dirname(__file__), "classicalNet.cfg")
 
     # Read configuration files for the virtual quantum, as well as the classical network
-    virtualNet = socketsConfig(virtualFile)
+    virtualNet = socketsConfig(network_file)
     classicalNet = socketsConfig(classicalFile)
 
     # Check if we should run a local classical server. If so, initialize the code