Version 1.1.0

Wrapped all the function bodies in '$Null=@()' to prevent extra return values.

Author: acksmaggart

Functions/ConfigGettersAndSetters.ps1

@@ -5,26 +5,32 @@ $script:defaultConfigPath = "$PSScriptRoot\..\Config\config.json"
 $script:registryConfigPath = "HKLM:\SOFTWARE\PythonPowershellUtilities"
 
 function Get-PythonUtilitiesConfigValue([string]$Key){
+$Null = @(
     # Add registry keys if they haven't been added already, otherwise just return them
     if (!(Test-Path $script:registryConfigPath)){
         New-Item -Path $script:registryConfigPath
         Set-PythonUtilitiesConfigValue -Key "PythonInstallRoot" -Value "C:\PythonInstallations"
         Set-PythonUtilitiesConfigValue -Key "VirtualEnvironmentRoot" -Value "C:\PythonVirtualEnvironments"
     }
     $entry = Get-ItemProperty $script:registryConfigPath -Name $Key
+)
     return $entry.$Key
 }
 
 function Set-PythonUtilitiesConfigValue([string]$Key, [string]$Value){
-    Set-ItemProperty -Path $script:registryConfigPath -Name $Key -Value $Value
+$Null = @(
+    Set-ItemProperty -Path $script:registryConfigPath -Name $Key -Value $Value > $null
+)
 }
 
 function Get-PythonInstallerCache(){
+$Null = @(
     $installRoot = Get-PythonInstallRoot
     $installerCache = "$installRoot\Installers"
     if (!(Test-Path $installerCache)){
-        New-Item -ItemType Directory -Path $installerCache -Force | Out-Null
+        New-Item -ItemType Directory -Path $installerCache -Force > $null
     }
+)
     return $installerCache
 }
 
@@ -33,6 +39,7 @@ function Get-PythonInstallRoot(){
 }
 
 function Set-PythonInstallRoot([string]$Path, [switch]$Force=$false){
+$Null = @(
     $installRoot = Get-PythonInstallRoot
     $installerCache = Get-PythonInstallerCache
     if (Test-Path -Path $installerCache){
@@ -57,15 +64,17 @@ function Set-PythonInstallRoot([string]$Path, [switch]$Force=$false){
             }
         }
     }
-    New-Item -ItemType directory -Path "$Path\Installers" -Force | Out-Null
+    New-Item -ItemType directory -Path "$Path\Installers" -Force > $null
     Set-PythonUtilitiesConfigValue -Key "PythonInstallRoot" -Value $Path
+)
 }
 
 function Get-VirtualEnvironmentRoot(){
     return Get-PythonUtilitiesConfigValue -Key "VirtualEnvironmentRoot"
 }
 
 function Set-VirtualEnvironmentRoot([string]$Path, [switch]$Force){
+$Null = @(
     if (!$Force){
         $venvRootPath = Get-VirtualEnvironmentRoot
         if (Test-Path $venvRootPath) {
@@ -79,4 +88,5 @@ function Set-VirtualEnvironmentRoot([string]$Path, [switch]$Force){
         }
     }
     Set-PythonUtilitiesConfigValue -Key "VirtualEnvironmentRoot" -Value $Path
+)
 }

Functions/Enter-PythonVirtualEnvironment.ps1

@@ -1,6 +1,7 @@
 . "$PSScriptRoot\ConfigGettersAndSetters.ps1"
 
 function Enter-PythonVirtualEnvironment([string]$Name){
+$Null = @(
     $virtualenvRoot = Get-VirtualEnvironmentRoot
 
     #Find matching virtualenv
@@ -16,4 +17,5 @@ function Enter-PythonVirtualEnvironment([string]$Name){
     }
 
     throw "Could not find a virtual environment in $virtualenvRoot whose name starts with $Name."
+)
 }

Functions/Get-InstalledPythonVersions.ps1

@@ -4,7 +4,7 @@ function Get-InstalledPythonVersions(){
     $installedVersions = @()
 
     foreach ($pathObj in Get-ChildItem "$installerCache\python*"){
-        $pathObj.Name -match $versionRegex | Out-Null
+        $pathObj.Name -match $versionRegex > $null
         $installedVersions += $Matches.version
     }
 

Functions/Get-PythonVirtualEnvironments.ps1

@@ -1,11 +1,12 @@
 . "$PSScriptRoot\ConfigGettersAndSetters.ps1"
 
 function Get-PythonVirtualEnvironments(){
+$Null = @(
     $virtualenvRoot = Get-VirtualEnvironmentRoot
     $virtualEnvironments = @()
     foreach ($item in Get-ChildItem $virtualenvRoot -Directory) {
         $virtualEnvironments += $item.Name
     }
-
+)
     return ,$virtualEnvironments
 }

Functions/Install-Python.ps1

@@ -2,6 +2,7 @@
 . "$PSScriptRoot\Get-PythonInstallerUrl.ps1"
 
 function Install-Python([string]$Version){
+$Null = @(
     $installerCache = Get-PythonInstallerCache
     $installerUrl = Get-PythonInstallerUrl -Version $Version
     $installRoot = Get-PythonInstallRoot
@@ -31,4 +32,5 @@ function Install-Python([string]$Version){
     if (!($result.ExitCode -eq 0)) {
         throw "Python installation failed."
     }
+)
 }

Functions/New-PythonVirtualEnvironment.ps1

@@ -1,6 +1,7 @@
 . "$PSScriptRoot\ConfigGettersAndSetters.ps1"
 
 function New-PythonVirtualEnvironment([string]$Version, [string]$Name){
+$Null = @(
     $installRoot = Get-PythonInstallRoot
     $virtualenvRoot = Get-VirtualEnvironmentRoot
     $pythonEXEPath = "$installRoot\python$Version\python.exe"
@@ -19,4 +20,5 @@ function New-PythonVirtualEnvironment([string]$Version, [string]$Name){
     if (!($result.ExitCode -eq 0)) {
         throw "Error creating virtual environment."
     }
+)
 }

Functions/Remove-PythonVirtualEnvironment.ps1

@@ -1,6 +1,7 @@
 . "$PSScriptRoot\ConfigGettersAndSetters.ps1"
 
 function Remove-PythonVirtualEnvironment([string]$Name, [switch]$YesToAll=$false){
+$Null = @(
     $virtualenvRoot = Get-VirtualEnvironmentRoot
 
     #Find matching virtualenv
@@ -18,4 +19,5 @@ function Remove-PythonVirtualEnvironment([string]$Name, [switch]$YesToAll=$false
     }
 
     throw "Could not find a virtual environment in $virtualenvRoot whose name starts with $Name."
+)
 }

Functions/Restore-PythonUtilitiesConfigDefaults.ps1

@@ -1,6 +1,7 @@
 . "$PSScriptRoot\ConfigGettersAndSetters.ps1"
 
 function Restore-PythonUtilitiesConfigDefaults([switch]$Force){
+$Null = @(
     if ($Force){
         Set-PythonInstallRoot -Path "C:\PythonInstallations\" -Force
         Set-VirtualEnvironmentRoot -Path "C:\PythonVirtualEnvironments\" -Force
@@ -9,5 +10,5 @@ function Restore-PythonUtilitiesConfigDefaults([switch]$Force){
         Set-PythonInstallRoot -Path "C:\PythonInstallations\"
         Set-VirtualEnvironmentRoot -Path "C:\PythonVirtualEnvironments\"
     }
-    
+)
 }

Functions/Uninstall-Python.ps1

@@ -1,4 +1,5 @@
 function Uninstall-Python([string]$Version){
+$Null = @(
     $installerCache = Get-PythonInstallerCache
     $installName = "python$Version"
     $installerEXEPath = "$installerCache\$installName-Installer.exe"
@@ -14,4 +15,5 @@ function Uninstall-Python([string]$Version){
     }
 
     Remove-Item -Path $installerEXEPath
+)
 }

PythonPowershellUtilities.psd1

@@ -12,7 +12,7 @@
     RootModule = 'PythonPowershellUtilities.psm1'
 
     # Version number of this module.
-    ModuleVersion = '1.0.2'
+    ModuleVersion = '1.1.0'
 
     # Supported PSEditions
     # CompatiblePSEditions = @()