Merge branch 'master' of https://github.com/getnamo/UnrealEnginePython

Content/Scripts/upycmd.py

@@ -15,7 +15,7 @@ def NormalizePaths():
 	#replace '/' to '\\'
 	for i in range(len(sys.path)):
 		currentPath = sys.path[i]
-		sys.path[i] = currentPath.replace('/','\\')
+		sys.path[i] = currentPath.replace('\\','/')
 
 		#find additional problem paths such as engine bin
 		currentPath = sys.path[i]
@@ -30,32 +30,32 @@ def NormalizePaths():
 #define some convenience paths
 def PythonHomePath():
 	for path in sys.path:
-		normalizedPath = path.replace('/','\\')
+		normalizedPath = AsAbsPath(path)
 		if ('UnrealEnginePython' in normalizedPath and
-			normalizedPath.endswith('Binaries\\Win64')):
+			normalizedPath.endswith('Binaries/Win64')):
 			return path
 
 	#return sys.path[1]
 	return "not found"
 
 def PythonHomeScriptsPath():
-	return PythonHomePath() + "/Scripts"
+	return AsAbsPath(PythonHomePath() + "/Scripts")
 
 def PythonPluginScriptPath():
 	for path in sys.path:
-		normalizedPath = path.replace('/','\\')
+		normalizedPath = AsAbsPath(path)
 		if ('UnrealEnginePython' in normalizedPath and
-			normalizedPath.endswith('Content\\Scripts')):
+			normalizedPath.endswith('Content/Scripts')):
 			return path
 
 	return "not found"
 
 def PythonProjectScriptPath():
 	relativePath = PythonPluginScriptPath() + "/../../../../Content/Scripts";
-	return os.path.abspath(relativePath);
+	return AsAbsPath(relativePath);
 
 def AsAbsPath(path):
-	return os.path.abspath(path)
+	return os.path.abspath(path).replace('\\','/')
 
 _PythonHomePath = PythonHomePath()
 

Content/Scripts/upymodule_importer.py

@@ -34,7 +34,10 @@ def parseJson(packagePath):
 				ue.log("upymodule_importer::" + module + " " + version + " installed? " + str(pip.isInstalled(module)))
 				if not pip.isInstalled(module, version):
 					ue.log('upymodule_importer::Dependency not installed, fetching via pip...')
-					pip.install(module + '==' + version)
+					if version == 'latest':
+						pip.install(module)
+					else:
+						pip.install(module + '==' + version)
 
 			dependencyNoun = 'dependencies'
 			if len(pythonModules) == 1:
@@ -45,3 +48,10 @@ def parseJson(packagePath):
 		e = sys.exc_info()[0]
 		ue.log('upymodule_importer::upymodule.json error: ' + str(e))
 
+def containsModuleFile(packagePath):
+	try:
+		with open(packagePath) as data_file:
+			return True
+	except:
+		return False
+

Content/Scripts/upypip.py

@@ -12,8 +12,11 @@ def __init__(self):
 		return None
 
 	#blocking actions, should be run on off-thread
-	def pipModuleAction(self, command, args, verbose=True):
-		return cmd.run('pip ' + command + ' ' + args, cmd.PythonHomeScriptsPath(), verbose)
+	def pipModuleAction(self, command, args=None, verbose=True):
+		if args:
+			return cmd.run('pip ' + command + ' ' + args, cmd.PythonHomeScriptsPath(), verbose)
+		else:
+			return cmd.run('pip ' + command, cmd.PythonHomeScriptsPath(), verbose)
 
 	#use this if you need to work on the resulting list to query current dependencies
 	def listDict(self, verbose=True):
@@ -37,6 +40,8 @@ def isDesiredVersionSufficient(self, desired, current):
 		return LooseVersion(desired) <= LooseVersion(current)
 
 	def isInstalled(self, module, desiredVersion=None):
+		if desiredVersion == 'latest':
+			desiredVersion = None
 		if PipInstall.modules == None:
 			PipInstall.modules = self.listDict(False)
 		if module in PipInstall.modules:
@@ -68,6 +73,11 @@ def list(self):
 		t = Thread(target=action)
 		t.start()
 
+	def action(self, command):
+		action = self.pipModuleAction
+		t = Thread(target=action, args=(command,))
+		t.start()
+
 	def uninstallAll(self):
 		PipInstall.modules = None #our cache is no longer valid
 		action = self.pipModuleAction
@@ -83,4 +93,5 @@ def uninstallAll(self):
 uninstall = _inst.uninstall
 uninstallAll = _inst.uninstallAll
 pipModuleAction = _inst.pipModuleAction
-listDict = _inst.listDict
+listDict = _inst.listDict
+action = _inst.action

Content/Scripts/upystartup.py

@@ -7,12 +7,13 @@
 from os import path as ospath
 import imp
 import site
+import upymodule_importer as upymod
 
 import upypip as pip
 
 def checkPipDirectory():
 	#get our python scripts path
-	configPath = cmd.PythonPluginScriptPath() + '/upyconfig.json'
+	configPath = cmd.AsAbsPath(cmd.PythonPluginScriptPath() + '/upyconfig.json')
 	correctPipPath = cmd.PythonHomeScriptsPath()
 
 	#check that we have a config file, if not make an empty one
@@ -89,7 +90,18 @@ def checkPipDirectory():
 	print('upystartup::system paths normalized.')
 	cmd.NormalizePaths();
 
+def checkProjectModuleFile():
+	path = cmd.PythonProjectScriptPath() + '/upymodule.json'
+	if upymod.containsModuleFile(path):
+		upymod.parseJson(path)
+		print("upystartup::project upymodule.json file parsed.")
+	else:
+		print("upystartup::project doesn't use a upymodule.json file.")
+
 #add any startup action you wish to perform in python
 def startup():
 	#check that our pip directory matches for pip.exe commands
 	checkPipDirectory()
+
+	#import any project specific modules
+	checkProjectModuleFile()

UnrealEnginePython.uplugin

@@ -1,7 +1,7 @@
 {
   "FileVersion": 3,
   "Version": 1,
-  "VersionName": "1.4.2",
+  "VersionName": "1.4.3",
   "FriendlyName": "UnrealEnginePython",
   "Description": "Embed a Python VM in your project",
   "Category": "Scripting Languages",