diff --git a/travis/Dockerfile.in b/travis/Dockerfile.in index a3c858ee..a1f30d7f 100644 --- a/travis/Dockerfile.in +++ b/travis/Dockerfile.in @@ -2,11 +2,11 @@ FROM ololobus/postgres-dev:stretch USER root RUN apt-get update -RUN apt-get -yq install python python-pip +RUN apt-get -yq install python3 python3-pip # RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py # RUN python2 get-pip.py -RUN python2 -m pip install virtualenv +RUN python3 -m pip install virtualenv # Environment ENV PG_MAJOR=${PG_VERSION} PG_BRANCH=${PG_BRANCH} diff --git a/travis/run_tests.sh b/travis/run_tests.sh index 9aa49bae..149111c6 100755 --- a/travis/run_tests.sh +++ b/travis/run_tests.sh @@ -67,17 +67,17 @@ make USE_PGXS=1 top_srcdir=$PG_SRC install # Setup python environment echo "############### Setting up python env:" -python2 -m virtualenv pyenv +python3 -m virtualenv pyenv source pyenv/bin/activate -pip install testgres==1.8.2 +pip3 install testgres echo "############### Testing:" if [ "$MODE" = "basic" ]; then export PG_PROBACKUP_TEST_BASIC=ON - python -m unittest -v tests - python -m unittest -v tests.init + python3 -m unittest -v tests + python3 -m unittest -v tests.init else - python -m unittest -v tests.$MODE + python3 -m unittest -v tests.$MODE fi # Generate *.gcov files