diff --git a/.travis.yml b/.travis.yml index 549a2a3..806dcc1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,9 +6,9 @@ services: - docker go: - - "1.14" - "1.15" - "1.16" + - "1.17" branches: only: @@ -17,30 +17,31 @@ branches: - thrift_0.12 addons: - apt: - sources: - - deadsnakes # source required so it finds the package definition below - packages: - - python3.6 + sources: + - deadsnakes # source required so it finds the package definition below + packages: + - python3.8 hosts: - hs2.example.com - kerberos.example.com before_install: - go get github.com/mattn/goveralls - - sudo apt-get -y install python3.6-dev - sudo apt-get -y install krb5-user - cat scripts/create_krbconf.sh - sudo bash scripts/create_krbconf.sh - docker network create com - - curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py - - python3.6 get-pip.py --user - travis_retry go get github.com/beltran/gssapi + env: - DOCKER_COMPOSE_VERSION=1.22.0 GO111MODULE=on script: + - pyenv versions + - pyenv global 3.7.1 + - curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py + - python3.7.1 get-pip.py --user - set -e - go vet ./... - go fmt ./... diff --git a/scripts/integration.sh b/scripts/integration.sh index 11b95d5..e38b230 100644 --- a/scripts/integration.sh +++ b/scripts/integration.sh @@ -34,9 +34,11 @@ function install_deps() { fi pushd dhive #git reset --hard 750e11b9c07d79d97aea1e182ef12965fc4e922d - sed -i.bak 's/python3/python3.6/g' ./Makefile + sed -i.bak 's/python3/python3.7.1/g' ./Makefile + sed -i.bak 's/\.load/\.safe_load/g' ./dhive.py + sed -i.bak 's/centos:8/centos:7/g' ./dhive/containers/base/Dockerfile - python3.6 -m pip install --user -r requirements.txt + python3.7.1 -m pip install --user -r requirements.txt sed -i.bak 's/hive_version.*/hive_version = 3.1.2/g' ./config/hive.cfg sed -i.bak 's/hive_version.*/hive_version = 3.1.2/g' ./config/hive_and_kerberos.cfg sed -i.bak 's/hadoop_version.*/hadoop_version = 2.10.1/g' ./config/hive.cfg