update pip and importer to support differentiating dependencies

getnamo · getnamo · commit 292badabaacd · 2017-02-16T01:46:43.000Z
-if our dependencies require a newer version the importer will attempt
to upgrade to newer dependency
-due to pip uninstall cmd crash, may need to run the project twice to
install properly
diff --git a/Content/Scripts/upymodule_importer.py b/Content/Scripts/upymodule_importer.py
@@ -27,7 +27,7 @@ def parseJson(packagePath):
 				version = pythonModules[module]
 
 				ue.log(module + " " + version + " installed? " + str(pip.isInstalled(module)))
-				if not pip.isInstalled(module):
+				if not pip.isInstalled(module, version):
 					ue.log('Dependency not installed, fetching via pip...')
 					pip.install(module + '==' + version)
 
diff --git a/Content/Scripts/upypip.py b/Content/Scripts/upypip.py
@@ -1,6 +1,7 @@
 import upycmd as cmd
 import sys
 from threading import Thread
+from distutils.version import LooseVersion
 
 
 class PipInstall:
@@ -32,11 +33,20 @@ def listDict(self, verbose=True):
 		PipInstall.modules = resultDict
 		return resultDict
 
-	def isInstalled(self, module):
+	def isDesiredVersionSufficient(self, desired, current):
+		return LooseVersion(desired) <= LooseVersion(current)
+
+	def isInstalled(self, module, desiredVersion=None):
 		if PipInstall.modules == None:
 			PipInstall.modules = self.listDict(False)
 		if module in PipInstall.modules:
-			return True
+			#did we specify a version? ensure we've installed that version at least
+			if desiredVersion:
+				#print('current version: ' + str(PipInstall.modules[module]))
+				#print('desired version: ' + str(desiredVersion))
+				return self.isDesiredVersionSufficient(desiredVersion, PipInstall.modules[module])
+			else:
+				return True
 		else:
 			return False
 
