Making sure python dependencies of dependency modules are also exported

Author: James Lechtner

src/cls/IPM/Lifecycle/Base.cls

@@ -1203,11 +1203,12 @@ Method %Export(
             kill tSingleModuleArray
             merge tSingleModuleArray = tResourceArray(tModuleName)
             do ..ExportSingleModule(.tSingleModuleArray, pTargetDirectory, .pDependencyGraph, .tParams, tVerbose)
-        }
 
-        set exportPythonDependencies = $get(pParams("ExportPythonDependencies"), 0)
-        if exportPythonDependencies {
-            do ..ExportPythonDependencies(.pParams)
+            set exportPythonDependencies = $get(pParams("ExportPythonDependencies"), 0)
+            if exportPythonDependencies {
+                set pyDepMod = ##class(%IPM.Storage.Module).NameOpen(tModuleName)
+                do ..ExportPythonDependencies(pyDepMod, .pParams)
+            }
         }
 
         // Export the deployed project to the target directory, if it's non-empty
@@ -1244,13 +1245,16 @@ Method %Export(
 }
 
 /// Downloads Python wheels for Python dependencies into the /root/wheels directory of the module. Also updates module.xml with the Python Wheel resources.
-Method ExportPythonDependencies(ByRef pParams)
+Method ExportPythonDependencies(
+	module As %IPM.Storage.Module,
+	ByRef pParams)
 {
-    set root = ##class(%File).NormalizeDirectory("", ..Module.Root)
+    set root = ##class(%File).NormalizeDirectory("", module.Root)
     $$$ThrowOnError(..InstallOrDownloadPythonRequirements(root, .pParams, 1))
-    set wheelsDir = ##class(%File).NormalizeDirectory("wheels", ..Module.Root)
+    set wheelsDir = ##class(%File).NormalizeDirectory("wheels", module.Root)
     if '##class(%File).DirectoryExists(wheelsDir) {
-        $$$ThrowStatus($$$ERROR($$$GeneralError, "Wheels directory: "_wheelsDir_" not found."))
+        write !, "WARNING: No wheels directory for this module: "_wheelsDir_" not found"
+        quit
     }
     set stmt = ##class(%SQL.Statement).%New()
     $$$ThrowOnError(stmt.%PrepareClassQuery("%File", "FileSet"))
@@ -1262,7 +1266,7 @@ Method ExportPythonDependencies(ByRef pParams)
         if (type '= "F") || (file = "") {
             continue
         }
-    do ##class(%IPM.StudioDocument.Module).AddPythonWheels(..Module.Name, file)
+        do ##class(%IPM.StudioDocument.Module).AddPythonWheels(module.Name, file)
     }
     $$$ThrowOnError(sc)
 }

tests/integration_tests/Test/PM/Integration/ProcessPythonWheel.cls

@@ -204,8 +204,16 @@ Method TestPackageWithPythonDeps() As %Status
 /// Test publishing with the -export-python-deps flag
 Method TestPublishWithPythonDeps() As %Status
 {
-    set moduleName = "publish-with-python-deps"
+    // First test the case where the module itself has python dependencies
+    do ..PublishTestHandler("publish-with-python-deps-dep")
 
+    // Next test the case where the base module has no ptyhon dependencies but dependency module does
+    do ..PublishTestHandler("publish-with-python-deps-base")
+}
+
+/// Handler method for publish test suite
+Method PublishTestHandler(moduleName As %String)
+{
     // Create a filesystem repository
     set dir = ..GetModuleDir("python-deps-tests", ..#PublishWithPythonDepsLocation)
     set sc = ##class(%IPM.Main).Shell("repo -fs -name localrepo -path "_dir)
@@ -220,7 +228,7 @@ Method TestPublishWithPythonDeps() As %Status
     do $$$AssertStatusOK(sc, "Configured remote repo")
 
     // Publish module to remote repository
-    set sc = ##class(%IPM.Main).Shell("publish -v "_moduleName_" -r remote -export-python-deps")
+    set sc = ##class(%IPM.Main).Shell("publish -v "_moduleName_" -r remote -export-python-deps -export-deps 1")
     do $$$AssertStatusOK(sc, "Published module "_moduleName_" to remote repository")
 
     // Uninstall module that came from filesystem repository

tests/integration_tests/Test/PM/Integration/_data/python-deps-tests/publish-with-python-deps/base-module/cls/Base/Class.cls

@@ -0,0 +1,9 @@
+Class Base.Class
+{
+
+ClassMethod MethodA()
+{
+    write !, "This is ##class(Base.Class).MethodA()"
+}
+
+}

tests/integration_tests/Test/PM/Integration/_data/python-deps-tests/publish-with-python-deps/base-module/module.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="25">
+    <Document name="publish-with-python-deps-base.ZPM">
+    <Module>
+      <Name>publish-with-python-deps-base</Name>
+      <Version>1.0.0</Version>
+      <Resource Name="Base.PKG" />
+      <Dependencies>
+        <ModuleReference>
+          <Name>publish-with-python-deps-dep</Name>
+          <Version>^1.0.0</Version>
+        </ModuleReference>
+      </Dependencies>
+    </Module>
+  </Document>
+</Export>

…-python-deps/lune-1.6.2-py3-none-any.whl …s/dep-module/lune-1.6.2-py3-none-any.whltests/integration_tests/Test/PM/Integration/_data/python-deps-tests/publish-with-python-deps/lune-1.6.2-py3-none-any.whl renamed to tests/integration_tests/Test/PM/Integration/_data/python-deps-tests/publish-with-python-deps/dep-module/lune-1.6.2-py3-none-any.whl tests/integration_tests/Test/PM/Integration/_data/python-deps-tests/publish-with-python-deps/lune-1.6.2-py3-none-any.whl renamed to tests/integration_tests/Test/PM/Integration/_data/python-deps-tests/publish-with-python-deps/dep-module/lune-1.6.2-py3-none-any.whl

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="IRIS" version="26">
-  <Document name="publish-with-python-deps.ZPM">
+  <Document name="publish-with-python-deps-dep.ZPM">
     <Module>
-      <Name>publish-with-python-deps</Name>
+      <Name>publish-with-python-deps-dep</Name>
       <Version>1.6.2</Version>
       <Packaging>module</Packaging>
       <PythonWheel Name="lune-1.6.2-py3-none-any.whl" Directory="." />