diff --git a/src/travis/osx-x86_64-before-install.sh b/src/travis/osx-x86_64-before-install.sh index 0d1b34b0..892a0322 100755 --- a/src/travis/osx-x86_64-before-install.sh +++ b/src/travis/osx-x86_64-before-install.sh @@ -12,6 +12,8 @@ sudo installer -pkg python-$BUILD_PYTHON_VERSION-macosx10.9.pkg -target / export python=python3 export pip=pip3 +brew install openssl@1.1 > /dev/null + # Compile latest OpenSSL #if [ ! -d openssl-$BUILD_OPENSSL_VERSION ]; then # wget --quiet https://www.openssl.org/source/openssl-$BUILD_OPENSSL_VERSION.tar.gz diff --git a/src/travis/windows-x86-before-install.sh b/src/travis/windows-x86-before-install.sh index 5497f020..b5564967 100755 --- a/src/travis/windows-x86-before-install.sh +++ b/src/travis/windows-x86-before-install.sh @@ -20,11 +20,14 @@ ls -al /c/Python37/DLLs until cp -v /c/ssl/*.dll /c/Python37/DLLs; do echo "trying again..."; done export PATH=$PATH:/c/Python37/scripts cd $mypath -pip install --upgrade pip -pip list --outdated --format=freeze | grep -v '^\-e' | cut -d = -f 1 | xargs -n1 pip install -U -pip install --upgrade -r src/requirements.txt +export python=python +export pip=pip -#pip install --upgrade pyinstaller +$pip install --upgrade pip +$pip list --outdated --format=freeze | grep -v '^\-e' | cut -d = -f 1 | xargs -n1 $pip install -U +$pip install --upgrade -r src/requirements.txt + +#$pip install --upgrade pyinstaller # Install PyInstaller from source and build bootloader # to try and avoid getting flagged as malware since # lots of malware uses PyInstaller default bootloader @@ -35,10 +38,10 @@ tar xf PyInstaller-$PYINSTALLER_VERSION.tar.gz cd PyInstaller-$PYINSTALLER_VERSION/bootloader echo "bootloader before:" md5sum ../PyInstaller/bootloader/Windows-32bit/* -/c/python37/python ./waf all --target-arch=32bit +$python ./waf all --target-arch=32bit echo "bootloader after:" md5sum ../PyInstaller/bootloader/Windows-32bit/* echo "PATH: $PATH" cd .. -/c/python37/python setup.py install +$python setup.py install cd $mypath diff --git a/src/travis/windows-x86_64-before-install.sh b/src/travis/windows-x86_64-before-install.sh index 0efd3ee3..c0d66446 100755 --- a/src/travis/windows-x86_64-before-install.sh +++ b/src/travis/windows-x86_64-before-install.sh @@ -20,10 +20,13 @@ ls -al /c/Python37/DLLs until cp -v /c/ssl/*.dll /c/Python37/DLLs; do echo "trying again..."; done export PATH=$PATH:/c/Python37/scripts cd $mypath -pip install --upgrade pip -pip list --outdated --format=freeze | grep -v '^\-e' | cut -d = -f 1 | xargs -n1 pip install -U -pip install --upgrade -r src/requirements.txt -#pip install --upgrade pyinstaller +export python=python +export pip=pip + +$pip install --upgrade pip +$pip list --outdated --format=freeze | grep -v '^\-e' | cut -d = -f 1 | xargs -n1 $pip install -U +$pip install --upgrade -r src/requirements.txt +#$pip install --upgrade pyinstaller # Install PyInstaller from source and build bootloader # to try and avoid getting flagged as malware since # lots of malware uses PyInstaller default bootloader @@ -34,10 +37,10 @@ tar xf PyInstaller-$PYINSTALLER_VERSION.tar.gz cd PyInstaller-$PYINSTALLER_VERSION/bootloader echo "bootloader before:" md5sum ../PyInstaller/bootloader/Windows-64bit/* -/c/python37/python ./waf all --target-arch=64bit +$python ./waf all --target-arch=64bit echo "bootloader after:" md5sum ../PyInstaller/bootloader/Windows-64bit/* echo "PATH: $PATH" cd .. -/c/python37/python setup.py install +$python setup.py install cd $mypath