From e250baf57b4c5b2bd1afdc89da13f770084f005c Mon Sep 17 00:00:00 2001 From: ulvii Date: Mon, 19 Jun 2017 14:32:24 -0700 Subject: [PATCH] Adding pyodbc install instructions to setup scripts --- test/Performance/setup_env_unix.sh | 32 ++++++++++++++++++++++---- test/Performance/setup_env_windows.ps1 | 6 +++++ 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/test/Performance/setup_env_unix.sh b/test/Performance/setup_env_unix.sh index d9a75a84..f32230a2 100644 --- a/test/Performance/setup_env_unix.sh +++ b/test/Performance/setup_env_unix.sh @@ -27,9 +27,12 @@ fi rm -rf env_setup.log touch env_setup.log if [ $PLATFORM = "Ubuntu16" ]; then - echo "Installing git, libxml, autoconf, openssl..." - yes | sudo apt-get install git autoconf libxml2-dev libssl-dev pkg-config >> env_setup.log 2>&1 - + echo "Installing git, libxml, autoconf, openssl, python3, pip3..." + yes | sudo apt-get install git autoconf libxml2-dev libssl-dev pkg-config python3 python3-pip >> env_setup.log 2>&1 + echo "OK" + echo "Installing pyodbc" + pip3 install --upgrade pip >> env_setup.log 2>&1 + pip3 install pyodbc >> env_setup.log 2>&1 echo "OK" echo "Installing MSODBCSQL..." curl -s https://packages.microsoft.com/keys/microsoft.asc | apt-key add - @@ -38,8 +41,21 @@ if [ $PLATFORM = "Ubuntu16" ]; then yes | sudo ACCEPT_EULA=Y apt-get install msodbcsql >> env_setup.log 2>&1 yes | sudo apt-get install -qq unixodbc-dev >> env_setup.log 2>&1 elif [ $PLATFORM = "RedHat7" ]; then - echo "Installing gcc, git, libxml, openssl..." - yes | sudo yum install -y gcc-c++ libxml2-devel git openssl-devel >> env_setup.log 2>&1 + echo "Enabling EPEL repo" + yes | sudo yum install epel-release >> env_setup.log 2>&1 + echo "OK" + echo "Installing python34-setuptools..." + yes | sudo yum install python34-setuptools >> env_setup.log 2>&1 + echo "OK" + echo "Installing gcc, git, libxml, openssl, EPEL, python3, pip3..." + yes | sudo yum install -y gcc-c++ libxml2-devel git openssl-devel python34 >> env_setup.log 2>&1 + echo "OK" + echo "Installing pip3" + yes | sudo easy_install-3.4 pip >> env_setup.log 2>&1 + echo "OK" + echo "Installing pyodbc" + pip3 install --upgrade pip >> env_setup.log 2>&1 + pip3 install pyodbc >> env_setup.log 2>&1 echo "OK" echo "Installing MSODBCSQL..." curl -s https://packages.microsoft.com/config/rhel/7/prod.repo > /etc/yum.repos.d/mssql-release.repo @@ -60,6 +76,12 @@ elif [ $PLATFORM = "Sierra" ]; then brew install pkg-config >> env_setup.log 2>&1 brew install openssl >> env_setup.log 2>&1 echo "OK" + echo "Installing python3..." + brew install python3 >> env_setup.log 2>&1 + echo "OK" + echo "Installing pyodbc..." + pip3 install pyodbc >> env_setup.log 2>&1 + echo "OK" echo "Installing MSODBCSQL..." brew tap microsoft/msodbcsql https://github.com/Microsoft/homebrew-msodbcsql >> env_setup.log 2>&1 brew update >> env_setup.log 2>&1 diff --git a/test/Performance/setup_env_windows.ps1 b/test/Performance/setup_env_windows.ps1 index 3fa72aa1..be52b74b 100644 --- a/test/Performance/setup_env_windows.ps1 +++ b/test/Performance/setup_env_windows.ps1 @@ -21,6 +21,12 @@ Write-Host "Downloading Git..." (New-Object System.Net.WebClient).DownloadFile('https://github.com/git-for-windows/git/releases/download/v2.13.0.windows.1/Git-2.13.0-64-bit.exe', "$tempFolder\git.exe") Write-Host "Installing Git..." .\temp\git.exe /SILENT | Out-Null +Write-Host "Downloading Python3..." +(New-Object System.Net.WebClient).DownloadFile('https://www.python.org/ftp/python/3.6.0/python-3.6.0-amd64.exe', "$tempFolder\python.exe") +Write-Host "Installing Python3..." +.\temp\python.exe /quiet InstallAllUsers=1 PrependPath=1 Include_test=0 | Out-Null +Write-Host "Installing pyodbc..." +pip3 install pyodbc | Out-Null Write-Host "Downloading MSODBCSQL..." (New-object System.Net.WebClient).DownloadFile('https://download.microsoft.com/download/D/5/E/D5EEF288-A277-45C8-855B-8E2CB7E25B96/x64/msodbcsql.msi', "$tempFolder\msodbcsql.msi") Write-Host "Installing MSODBCSQL..."