Merge pull request #946 from mandiant/python3-library-update

Update Python3 Libraries Package with New Function
mandiant · Apr 10, 2024 · a94caaa · a94caaa
2 parents 5dcdd11 + 60a500c
commit a94caaa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/packages/libraries.python3.vm/libraries.python3.vm.nuspec b/packages/libraries.python3.vm/libraries.python3.vm.nuspec
@@ -2,11 +2,11 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2015/06/nuspec.xsd">
   <metadata>
     <id>libraries.python3.vm</id>
-    <version>0.0.0.20240325</version>
+    <version>0.0.0.20240410</version>
     <description>Metapackage to install common Python libraries</description>
     <authors>Several, check in pypi.org for every of the libraries</authors>
     <dependencies>
-      <dependency id="common.vm" />
+      <dependency id="common.vm" version="[0.0.0.20240409]"/>
       <dependency id="vcbuildtools.vm" />
       <dependency id="python3.vm" />
     </dependencies>

diff --git a/packages/libraries.python3.vm/tools/chocolateyinstall.ps1 b/packages/libraries.python3.vm/tools/chocolateyinstall.ps1
@@ -6,11 +6,8 @@ try {
     $modulesPath = Join-Path $toolDir "modules.xml" -Resolve
     $modulesXml = [xml](Get-Content $modulesPath)
 
-    # Create output file to log python module installation details
-    $outputFile = VM-New-Install-Log $toolDir
-
     # Fix pip version
-    Invoke-Expression "py -3.10 -m pip install pip~=23.2.1 >> $outputFile"
+    VM-Pip-Install "pip~=23.2.1"
 
     $failures = @()
     $modules = $modulesXml.modules.module
@@ -21,7 +18,7 @@ try {
             $installValue = $module.url
         }
 
-        Invoke-Expression "py -3.10 -m pip install $installValue 2>&1 >> $outputFile"
+        VM-Pip-Install $installValue
 
         if ($LastExitCode -eq 0) {
             Write-Host "`t[+] Installed Python 3.10 module: $($module.name)" -ForegroundColor Green
@@ -44,4 +41,3 @@ try {
 } catch {
     VM-Write-Log-Exception $_
 }
-