Merge branch 'master' into feature_intent_container_tree

plugins/VersionUpgrade/VersionUpgrade25to26/tests/TestVersionUpgrade25to26.py

@@ -1,5 +1,8 @@
 # Copyright (c) 2017 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
+import os.path
+import sys
+sys.path.append(os.path.join(os.path.dirname(os.path.abspath(__file__)), ".."))
 
 import configparser #To check whether the appropriate exceptions are raised.
 import pytest #To register tests with.

plugins/VersionUpgrade/VersionUpgrade26to27/tests/TestVersionUpgrade26to27.py

@@ -3,7 +3,9 @@
 
 import configparser #To check whether the appropriate exceptions are raised.
 import pytest #To register tests with.
-
+import os.path
+import sys
+sys.path.append(os.path.join(os.path.dirname(os.path.abspath(__file__)), ".."))
 import VersionUpgrade26to27 #The module we're testing.
 
 ##  Creates an instance of the upgrader to test with.

plugins/VersionUpgrade/VersionUpgrade27to30/tests/TestVersionUpgrade27to30.py

@@ -1,6 +1,8 @@
 # Copyright (c) 2017 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
-
+import os.path
+import sys
+sys.path.append(os.path.join(os.path.dirname(os.path.abspath(__file__)), ".."))
 import configparser #To parse the resulting config files.
 import pytest #To register tests with.
 

plugins/VersionUpgrade/VersionUpgrade34to35/tests/TestVersionUpgrade34to35.py

@@ -1,6 +1,8 @@
 # Copyright (c) 2018 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
-
+import os.path
+import sys
+sys.path.append(os.path.join(os.path.dirname(os.path.abspath(__file__)), ".."))
 import configparser #To parse the resulting config files.
 import pytest #To register tests with.