deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2026-07-03 12:21:35 +00:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity

fixes for Python 3.8.0

Browse Source
This commit is contained in:
Jay Lee
2019-10-14 20:03:46 -04:00
parent 90226c6981
commit 8cf8d51c79
3 changed files with 35 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/travis/linux-x86_64-before-install.sh
View File

@@ -12,7 +12,11 @@ else
SSLRESULT=$? SSLRESULT=$?
PYVER=$(~/python/bin/python3 -V) PYVER=$(~/python/bin/python3 -V)
PYRESULT=$? PYRESULT=$?
if [[ "$SSLRESULT" != "0" ]] || [[ "$SSLVER" != *"$BUILD_OPENSSL_VERSION"* ]] || [[ "$PYRESULT" != "0" ]] || [[ "$PYVER" != *"$PYTHON_BUILD_VERSION"* ]]; then if [[ "$SSLRESULT" != "0" ]] || [[ "$SSLVER" != "OpenSSL $BUILD_OPENSSL_VERSION "* ]] || [[ "$PYRESULT" != "0" ]] || [[ "$PYVER" != "Python $PYTHON_BUILD_VERSION "* ]]; then
rm -rf ~/ssl
rm -rf ~/python
mkdir ~/ssl
mkdir ~/python
echo "RUNNING: apt update..." echo "RUNNING: apt update..."
sudo apt-get -qq --yes update > /dev/null sudo apt-get -qq --yes update > /dev/null
echo "RUNNING: apt dist-upgrade..." echo "RUNNING: apt dist-upgrade..."

16
src/travis/osx-x86_64-before-install.sh
View File

@@ -5,15 +5,15 @@ whereibelong=$(pwd)
#brew upgrade #brew upgrade
cd ~/pybuild cd ~
#if [ ! -f python-$BUILD_PYTHON_VERSION-macosx10.9.pkg ]; then if [ ! -f python-$BUILD_PYTHON_VERSION-macosx10.9.pkg ]; then
# wget --quiet https://www.python.org/ftp/python/$BUILD_PYTHON_VERSION/python-$BUILD_PYTHON_VERSION-macosx10.9.pkg wget --quiet https://www.python.org/ftp/python/$BUILD_PYTHON_VERSION/python-$BUILD_PYTHON_VERSION-macosx10.9.pkg
#fi fi
#sudo installer -pkg python-$BUILD_PYTHON_VERSION-macosx10.9.pkg -target / sudo installer -pkg python-$BUILD_PYTHON_VERSION-macosx10.9.pkg -target /
brew install openssl@1.1 #brew install openssl@1.1
brew upgrade python #brew upgrade python
export python=python3 export python=python3
export pip=pip3 export pip=pip3
@@ -35,7 +35,7 @@ which $python
#echo "Running make install for OpenSSL..." #echo "Running make install for OpenSSL..."
#make install > /dev/null #make install > /dev/null
#export LD_LIBRARY_PATH=~/ssl/lib #export LD_LIBRARY_PATH=~/ssl/lib
#cd ~/pybuild #cd ~
# Compile latest Python # Compile latest Python
#if [ ! -d Python-$BUILD_PYTHON_VERSION ]; then #if [ ! -d Python-$BUILD_PYTHON_VERSION ]; then

35
src/travis/windows-x86_64-before-install.sh
View File

@@ -1,22 +1,31 @@
echo "Installing Net-Framework-Core..." echo "Installing Net-Framework-Core..."
export mypath=$(pwd) export mypath=$(pwd)
until powershell Install-WindowsFeature Net-Framework-Core; do echo "trying again..."; done until powershell Install-WindowsFeature Net-Framework-Core; do echo "trying again..."; done
cd ~/pybuild cd ~
export exefile=Win64OpenSSL_Light-${BUILD_OPENSSL_VERSION//./_}.exe #export exefile=Win64OpenSSL_Light-${BUILD_OPENSSL_VERSION//./_}.exe
if [ ! -e $exefile ]; then #if [ ! -e $exefile ]; then
echo "Downloading $exefile..." # echo "Downloading $exefile..."
wget --quiet https://slproweb.com/download/$exefile # wget --quiet https://slproweb.com/download/$exefile
#fi
#echo "Installing $exefile..."
#powershell ".\\${exefile} /silent /sp- /suppressmsgboxes /DIR=C:\\ssl"
#cinst -y python3
PYVER=$(~/python/python.exe -V)
PYRESULT=$?
if [[ "$PYRESULT" != "0" ]] || [[ "$PYVER" != *"$BUILD_PYTHON_VERSION"* ]]; then
rm -rf python
mkdir python
echo "Downloading Python $BUILD_PYTHON_VERSION..."
wget --quiet https://www.python.org/ftp/python/$BUILD_PYTHON_VERSION/python-$BUILD_PYTHON_VERSION-embed-amd64.zip
7z e python-$BUILD_PYTHON_VERSION-embed-amd64.zip -oC:\Users\travis\python
fi fi
echo "Installing $exefile..."
powershell ".\\${exefile} /silent /sp- /suppressmsgboxes /DIR=C:\\ssl"
cinst -y python3
until cinst -y wixtoolset; do echo "trying again..."; done 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/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 #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/Python37/scripts export PATH=$PATH:/c/Users/travis/python/scripts
cd $mypath cd $mypath
export python=/c/Python37/python.exe export python=/c/Users/travis/python/python.exe
export pip=pip export pip=/c/Users/travis/python/scripts/pip.exe
$pip install --upgrade pip $pip install --upgrade pip
$pip list --outdated --format=freeze | grep -v '^\-e' | cut -d = -f 1 | xargs -n1 $pip install -U $pip list --outdated --format=freeze | grep -v '^\-e' | cut -d = -f 1 | xargs -n1 $pip install -U