From 0541d213648168f70cc846edbc738bc78a218996 Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Wed, 26 Feb 2020 14:33:39 -0500
Subject: [PATCH] python.org for Windows install

---
 src/travis/windows-x86-before-install.sh    | 12 +++++++-----
 src/travis/windows-x86_64-before-install.sh | 13 ++++++++-----
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/travis/windows-x86-before-install.sh b/src/travis/windows-x86-before-install.sh
index 620accbb..461c86aa 100755
--- a/src/travis/windows-x86-before-install.sh
+++ b/src/travis/windows-x86-before-install.sh
@@ -2,13 +2,15 @@ echo "Installing Net-Framework-Core..."
 export mypath=$(pwd)
 cd ~
 until powershell Install-WindowsFeature Net-Framework-Core; do echo "trying again..."; done
-cup -y chocolatey
-cinst -y --forcex86 python3
+#cinst -y --forcex86 python3
+export python_file=python-$BUILD_PYTHON_VERSION.exe
+wget --quiet https://www.python.org/ftp/python/$BUILD_PYTHON_VERSION/$python_file
+powershell ".\\${python_file} /quiet InstallAllUsers=1 TargetDir=c:\\python"
 until cinst -y wixtoolset; do echo "trying again..."; done
-export PATH=$PATH:/c/Python38/scripts
+export PATH=$PATH:/c/python/scripts
 cd $mypath
-export python=/c/Python38/python.exe
-export pip=/c/Python38/scripts/pip.exe
+export python=/c/python/python.exe
+export pip=/c/python/scripts/pip.exe
 
 $pip install --upgrade pip
 $pip list --outdated --format=freeze | grep -v '^\-e' | cut -d = -f 1  | xargs -n1 $pip install -U
diff --git a/src/travis/windows-x86_64-before-install.sh b/src/travis/windows-x86_64-before-install.sh
index 7a698108..3135f0dc 100755
--- a/src/travis/windows-x86_64-before-install.sh
+++ b/src/travis/windows-x86_64-before-install.sh
@@ -9,15 +9,18 @@ cd ~
 #fi
 #echo "Installing $exefile..."
 #powershell ".\\${exefile} /silent /sp- /suppressmsgboxes /DIR=C:\\ssl"
-cup -y chocolatey
-cinst -y python3
+#cup -y chocolatey
+#cinst -y python3
+export python_file=python-$BUILD_PYTHON_VERSION-amd64.exe
+wget --quiet https://www.python.org/ftp/python/$BUILD_PYTHON_VERSION/$python_file
+powershell ".\\${python_file} /quiet InstallAllUsers=1 TargetDir=c:\\python"
 until cinst -y wixtoolset; do echo "trying again..."; done
 #until cp -v /c/ssl/libcrypto-1_1-x64.dll /c/Python37/DLLs/libcrypto-1_1.dll; do echo "trying again..."; done
 #until cp -v /c/ssl/libssl-1_1-x64.dll /c/Python37/DLLs/libssl-1_1.dll; do echo "trying again..."; done
-export PATH=$PATH:/c/Python38/scripts
+export PATH=$PATH:/c/python/scripts
 cd $mypath
-export python=/c/Python38/python.exe
-export pip=/c/Python38/scripts/pip.exe
+export python=/c/python/python.exe
+export pip=/c/python/scripts/pip.exe
 
 $pip install --upgrade pip
 $pip list --outdated --format=freeze | grep -v '^\-e' | cut -d = -f 1  | xargs -n1 $pip install -U