From 781e516769fc48f052c7448e8a2e2b7530d819f3 Mon Sep 17 00:00:00 2001 From: Valentin Samir Date: Wed, 1 Jan 2020 12:14:44 +0100 Subject: [PATCH] Update .travis.yml to use python3 for flake8, check_rst and coverage --- .travis.yml | 6 +++--- .update_coverage | 10 +++++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5b8a997..d2b02b2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,9 @@ language: python matrix: include: - - python: "2.7" + - python: "3.7" env: TOX_ENV=flake8 - - python: "2.7" + - python: "3.7" env: TOX_ENV=check_rst - python: "2.7" env: TOX_ENV=py27-django111 @@ -19,7 +19,7 @@ matrix: env: TOX_ENV=py35-django21 - python: "3.6" env: TOX_ENV=py36-django21 - - python: "2.7" + - python: "3.7" env: TOX_ENV=coverage cache: directories: diff --git a/.update_coverage b/.update_coverage index 402179c..0c51404 100755 --- a/.update_coverage +++ b/.update_coverage @@ -1,5 +1,7 @@ #!/bin/bash -BASEDIR="$1" +set -x +set -e +BASEDIR="$(realpath "$1")" PROJECT_NAME="$2" TITLE="Coverage report of $PROJECT_NAME" @@ -31,7 +33,7 @@ fi VENV="$(mktemp -d)" HTMLREPORT="$(mktemp -d)" -virtualenv "$VENV" +virtualenv -p python3 "$VENV" "$VENV/bin/pip" install coverage "$VENV/bin/coverage" html --title "$TITLE" --directory "$HTMLREPORT" rm -rf "$VENV" @@ -43,12 +45,14 @@ cd "$BASEDIR" rm -rf "$HTMLREPORT" - +set +x +echo "curl https://badges.genua.fr/coverage/ ..." curl https://badges.genua.fr/coverage/ \ -F "secret=$COVERAGE_TOKEN" \ -F "tar=@$BASEDIR/coverage.tar.gz" \ -F "project=$PROJECT_NAME" \ -F "branch=$BRANCH" +set -x rm "$BASEDIR/coverage.tar.gz"