Allow NOT to install pip dependencies

pkg/windows/build_env_2.ps1

@@ -22,22 +22,10 @@
 
 # Load parameters
 param(
-    [switch]$Silent
+    [switch]$Silent,
+    [switch]$NoPipDependencies
 )
 
-Write-Output "================================================================="
-Write-Output ""
-Write-Output "               Development Environment Installation"
-Write-Output ""
-Write-Output "               - Installs All Salt Dependencies"
-Write-Output "               - Detects 32/64 bit Architectures"
-Write-Output ""
-Write-Output "               To run silently add -Silent"
-Write-Output "               eg: dev_env.ps1 -Silent"
-Write-Output ""
-Write-Output "================================================================="
-Write-Output ""
-
 #==============================================================================
 # Get the Directory of actual script
 #==============================================================================
@@ -49,6 +37,22 @@ $script_path = $script_path.DirectoryName
 #==============================================================================
 $script_name = $MyInvocation.MyCommand.Name
 
+Write-Output "================================================================="
+Write-Output ""
+Write-Output "               Development Environment Installation"
+Write-Output ""
+Write-Output "               - Installs All Salt Dependencies"
+Write-Output "               - Detects 32/64 bit Architectures"
+Write-Output ""
+Write-Output "               To run silently add -Silent"
+Write-Output "               eg: ${script_name} -Silent"
+Write-Output ""
+Write-Output "               To run skip installing pip dependencies add -NoPipDependencies"
+Write-Output "               eg: ${script_name} -NoPipDependencies"
+Write-Output ""
+Write-Output "================================================================="
+Write-Output ""
+
 #==============================================================================
 # Import Modules
 #==============================================================================
@@ -211,25 +215,46 @@ if ( ! [bool]$Env:SALT_PIP_LOCAL_CACHE) {
 }
 
 #==============================================================================
-# Install pypi resources using pip
+# Install windows specific pypi resources using pip
 #    caching depends on environment variable SALT_REQ_LOCAL_CACHE
 #==============================================================================
 Write-Output " ----------------------------------------------------------------"
-Write-Output " - $script_name :: Installing pypi resources using pip . . ."
+Write-Output " - $script_name :: Installing windows specific pypi resources using pip . . ."
 Write-Output " ----------------------------------------------------------------"
 if ( ! [bool]$Env:SALT_REQ_LOCAL_CACHE) {
-    Start_Process_and_test_exitcode "cmd" "/c $($ini['Settings']['Python2Dir'])\python.exe -m pip --disable-pip-version-check --no-cache-dir install -r $($script_path)\req.txt" "pip install"
+    Start_Process_and_test_exitcode "cmd" "/c $($ini['Settings']['Python2Dir'])\python.exe -m pip --disable-pip-version-check --no-cache-dir install -r $($script_path)\req_win.txt" "pip install"
 } else {
     if ( (Get-ChildItem $Env:SALT_REQ_LOCAL_CACHE | Measure-Object).Count -eq 0 ) {
         # folder empty
-        Write-Output "    pip download from req.txt into empty local cache SALT_REQ $Env:SALT_REQ_LOCAL_CACHE"
+        Write-Output "    pip download from req_win.txt into empty local cache SALT_REQ $Env:SALT_REQ_LOCAL_CACHE"
-        Start_Process_and_test_exitcode "cmd" "/c $($ini['Settings']['Python2Dir'])\python.exe -m pip --disable-pip-version-check download --dest $Env:SALT_REQ_LOCAL_CACHE -r $($script_path)\req.txt" "pip download"
+        Start_Process_and_test_exitcode "cmd" "/c $($ini['Settings']['Python2Dir'])\python.exe -m pip --disable-pip-version-check download --dest $Env:SALT_REQ_LOCAL_CACHE -r $($script_path)\req_win.txt" "pip download"
     }
     Write-Output "    reading from local pip cache $Env:SALT_REQ_LOCAL_CACHE"
     Write-Output "    If a (new) resource is missing, please delete all files in this cache, go online and repeat"
-  Start_Process_and_test_exitcode "cmd" "/c $($ini['Settings']['Python2Dir'])\python.exe -m pip --disable-pip-version-check install --no-index --find-links=$Env:SALT_REQ_LOCAL_CACHE -r $($script_path)\req.txt" "pip install"
+  Start_Process_and_test_exitcode "cmd" "/c $($ini['Settings']['Python2Dir'])\python.exe -m pip --disable-pip-version-check install --no-index --find-links=$Env:SALT_REQ_LOCAL_CACHE -r $($script_path)\req_win.txt" "pip install"
 }
 
+#==============================================================================
+# Install pypi resources using pip
+#    caching depends on environment variable SALT_REQ_LOCAL_CACHE
+#==============================================================================
+If ($NoPipDependencies -eq $false) {
+  Write-Output " ----------------------------------------------------------------"
+  Write-Output " - $script_name :: Installing pypi resources using pip . . ."
+  Write-Output " ----------------------------------------------------------------"
+  if ( ! [bool]$Env:SALT_REQ_LOCAL_CACHE) {
+      Start_Process_and_test_exitcode "cmd" "/c $($ini['Settings']['Python2Dir'])\python.exe -m pip --disable-pip-version-check --no-cache-dir install -r $($script_path)\req.txt" "pip install"
+  } else {
+      if ( (Get-ChildItem $Env:SALT_REQ_LOCAL_CACHE | Measure-Object).Count -eq 0 ) {
+          # folder empty
+          Write-Output "    pip download from req.txt into empty local cache SALT_REQ $Env:SALT_REQ_LOCAL_CACHE"
+          Start_Process_and_test_exitcode "cmd" "/c $($ini['Settings']['Python2Dir'])\python.exe -m pip --disable-pip-version-check download --dest $Env:SALT_REQ_LOCAL_CACHE -r $($script_path)\req.txt" "pip download"
+      }
+      Write-Output "    reading from local pip cache $Env:SALT_REQ_LOCAL_CACHE"
+      Write-Output "    If a (new) resource is missing, please delete all files in this cache, go online and repeat"
+    Start_Process_and_test_exitcode "cmd" "/c $($ini['Settings']['Python2Dir'])\python.exe -m pip --disable-pip-version-check install --no-index --find-links=$Env:SALT_REQ_LOCAL_CACHE -r $($script_path)\req.txt" "pip install"
+  }
+}
 #==============================================================================
 # Cleaning Up PyWin32
 #==============================================================================

pkg/windows/build_env_3.ps1

@@ -22,22 +22,10 @@
 
 # Load parameters
 param(
-    [switch]$Silent
+    [switch]$Silent,
+    [switch]$NoPipDependencies
 )
 
-Write-Output "================================================================="
-Write-Output ""
-Write-Output "               Development Environment Installation"
-Write-Output ""
-Write-Output "               - Installs All Salt Dependencies"
-Write-Output "               - Detects 32/64 bit Architectures"
-Write-Output ""
-Write-Output "               To run silently add -Silent"
-Write-Output "               eg: dev_env.ps1 -Silent"
-Write-Output ""
-Write-Output "================================================================="
-Write-Output ""
-
 #==============================================================================
 # Get the Directory of actual script
 #==============================================================================
@@ -49,6 +37,22 @@ $script_path = $script_path.DirectoryName
 #==============================================================================
 $script_name = $MyInvocation.MyCommand.Name
 
+Write-Output "================================================================="
+Write-Output ""
+Write-Output "               Development Environment Installation"
+Write-Output ""
+Write-Output "               - Installs All Salt Dependencies"
+Write-Output "               - Detects 32/64 bit Architectures"
+Write-Output ""
+Write-Output "               To run silently add -Silent"
+Write-Output "               eg: ${script_name} -Silent"
+Write-Output ""
+Write-Output "               To run skip installing pip dependencies add -NoPipDependencies"
+Write-Output "               eg: ${script_name} -NoPipDependencies"
+Write-Output ""
+Write-Output "================================================================="
+Write-Output ""
+
 #==============================================================================
 # Import Modules
 #==============================================================================
@@ -211,23 +215,45 @@ if ( ! [bool]$Env:SALT_PIP_LOCAL_CACHE) {
 }
 
 #==============================================================================
-# Install pypi resources using pip
+# Install windows specific pypi resources using pip
 #    caching depends on environment variable SALT_REQ_LOCAL_CACHE
 #==============================================================================
 Write-Output " ----------------------------------------------------------------"
-Write-Output " - $script_name :: Installing pypi resources using pip . . ."
+Write-Output " - $script_name :: Installing windows specific pypi resources using pip . . ."
 Write-Output " ----------------------------------------------------------------"
 if ( ! [bool]$Env:SALT_REQ_LOCAL_CACHE) {
-    Start_Process_and_test_exitcode "cmd" "/c $($ini['Settings']['Python3Dir'])\python.exe -m pip --disable-pip-version-check --no-cache-dir install -r $($script_path)\req.txt" "pip install"
+    Start_Process_and_test_exitcode "cmd" "/c $($ini['Settings']['Python3Dir'])\python.exe -m pip --disable-pip-version-check --no-cache-dir install -r $($script_path)\req_win.txt" "pip install"
 } else {
     if ( (Get-ChildItem $Env:SALT_REQ_LOCAL_CACHE | Measure-Object).Count -eq 0 ) {
         # folder empty
-        Write-Output "    pip download from req.txt into empty local cache SALT_REQ $Env:SALT_REQ_LOCAL_CACHE"
+        Write-Output "    pip download from req_win.txt into empty local cache SALT_REQ $Env:SALT_REQ_LOCAL_CACHE"
-        Start_Process_and_test_exitcode "cmd" "/c $($ini['Settings']['Python3Dir'])\python.exe -m pip --disable-pip-version-check download --dest $Env:SALT_REQ_LOCAL_CACHE -r $($script_path)\req.txt" "pip download"
+        Start_Process_and_test_exitcode "cmd" "/c $($ini['Settings']['Python3Dir'])\python.exe -m pip --disable-pip-version-check download --dest $Env:SALT_REQ_LOCAL_CACHE -r $($script_path)\req_win.txt" "pip download"
     }
     Write-Output "    reading from local pip cache $Env:SALT_REQ_LOCAL_CACHE"
     Write-Output "    If a (new) resource is missing, please delete all files in this cache, go online and repeat"
-  Start_Process_and_test_exitcode "cmd" "/c $($ini['Settings']['Python3Dir'])\python.exe -m pip --disable-pip-version-check install --no-index --find-links=$Env:SALT_REQ_LOCAL_CACHE -r $($script_path)\req.txt" "pip install"
+  Start_Process_and_test_exitcode "cmd" "/c $($ini['Settings']['Python3Dir'])\python.exe -m pip --disable-pip-version-check install --no-index --find-links=$Env:SALT_REQ_LOCAL_CACHE -r $($script_path)\req_win.txt" "pip install"
+}
+
+#==============================================================================
+# Install pypi resources using pip
+#    caching depends on environment variable SALT_REQ_LOCAL_CACHE
+#==============================================================================
+If ($NoPipDependencies -eq $false) {
+  Write-Output " ----------------------------------------------------------------"
+  Write-Output " - $script_name :: Installing pypi resources using pip . . ."
+  Write-Output " ----------------------------------------------------------------"
+  if ( ! [bool]$Env:SALT_REQ_LOCAL_CACHE) {
+      Start_Process_and_test_exitcode "cmd" "/c $($ini['Settings']['Python3Dir'])\python.exe -m pip --disable-pip-version-check --no-cache-dir install -r $($script_path)\req.txt" "pip install"
+  } else {
+      if ( (Get-ChildItem $Env:SALT_REQ_LOCAL_CACHE | Measure-Object).Count -eq 0 ) {
+          # folder empty
+          Write-Output "    pip download from req.txt into empty local cache SALT_REQ $Env:SALT_REQ_LOCAL_CACHE"
+          Start_Process_and_test_exitcode "cmd" "/c $($ini['Settings']['Python3Dir'])\python.exe -m pip --disable-pip-version-check download --dest $Env:SALT_REQ_LOCAL_CACHE -r $($script_path)\req.txt" "pip download"
+      }
+      Write-Output "    reading from local pip cache $Env:SALT_REQ_LOCAL_CACHE"
+      Write-Output "    If a (new) resource is missing, please delete all files in this cache, go online and repeat"
+    Start_Process_and_test_exitcode "cmd" "/c $($ini['Settings']['Python3Dir'])\python.exe -m pip --disable-pip-version-check install --no-index --find-links=$Env:SALT_REQ_LOCAL_CACHE -r $($script_path)\req.txt" "pip install"
+  }
 }
 
 #==============================================================================
@@ -262,11 +288,13 @@ Remove-Item "$($ini['Settings']['Scripts3Dir'])\pywin32_*" -Force -Recurse
 #==============================================================================
 # Fix PyCrypto
 #==============================================================================
-Write-Output " ----------------------------------------------------------------"
+If ($NoPipDependencies -eq $false) {
-Write-Output "   - $script_name :: Fixing PyCrypto . . ."
+  Write-Output " ----------------------------------------------------------------"
-Write-Output " ----------------------------------------------------------------"
+  Write-Output "   - $script_name :: Fixing PyCrypto . . ."
-$nt_file = "$($ini['Settings']['Python3Dir'])\Lib\site-packages\Crypto\Random\OSRNG\nt.py"
+  Write-Output " ----------------------------------------------------------------"
-(Get-Content $nt_file) | Foreach-Object {$_ -replace '^import winrandom$', 'from Crypto.Random.OSRNG import winrandom'} | Set-Content $nt_file
+  $nt_file = "$($ini['Settings']['Python3Dir'])\Lib\site-packages\Crypto\Random\OSRNG\nt.py"
+  (Get-Content $nt_file) | Foreach-Object {$_ -replace '^import winrandom$', 'from Crypto.Random.OSRNG import winrandom'} | Set-Content $nt_file
+}
 
 #==============================================================================
 # Copy DLLs to Python Directory

pkg/windows/req.txt

@@ -1,3 +1,4 @@
+-r req_win.txt
 backports-abc==0.5
 backports.ssl-match-hostname==3.5.0.1
 certifi
@@ -28,7 +29,6 @@ pyOpenSSL==17.5.0
 python-dateutil==2.6.1
 python-gnupg==0.4.1
 pythonnet==2.3.0
-pywin32==223
 PyYAML==3.12
 pyzmq==16.0.3
 requests==2.21.0
@@ -37,4 +37,3 @@ smmap==0.9.0
 timelib==0.2.4
 tornado==4.5.1
 wheel==0.30.0a0
-WMI==1.4.9

pkg/windows/req_win.txt

@@ -0,0 +1,2 @@
+pywin32==223
+WMI==1.4.9