From 7df3bcfc7850c24b92f627101c5b79365e672c17 Mon Sep 17 00:00:00 2001
From: Marko Petric <marko.petric@cern.ch>
Date: Tue, 24 Sep 2019 14:34:42 +0200
Subject: [PATCH] Add pylint py3k check and flake8 compliance to tests
---
.dd4hep-ci.d/runPythonChecks.sh | 10 ++++++++++
.travis.yml | 18 ++++++++++++------
2 files changed, 22 insertions(+), 6 deletions(-)
create mode 100755 .dd4hep-ci.d/runPythonChecks.sh
diff --git a/.dd4hep-ci.d/runPythonChecks.sh b/.dd4hep-ci.d/runPythonChecks.sh
new file mode 100755
index 000000000..50b257d4c
--- /dev/null
+++ b/.dd4hep-ci.d/runPythonChecks.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+source /DD4hep/.dd4hep-ci.d/init_x86_64.sh
+cd /DD4hep
+
+echo "RUNNING PYLINT PY3K CHECK" && \
+find . -name "*.py" -and -not -name 'ddsix.py' -exec pylint -E --rcfile=.dd4hep-ci.d/DD4hep.pylint.py3k.rc --py3k --msg-template="{path}:{line}: [{msg_id}({symbol}), {obj}] {msg}" {} + && \
+echo "" && \
+echo "RUNNING FLAKE8 CHECK" && \
+find . -name "*.py" -and -not -name 'ddsix.py' -exec flake8 {} +
diff --git a/.travis.yml b/.travis.yml
index 155b1ebc1..c4d1ca36c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,10 +8,11 @@ language: cpp
env:
matrix:
- - COMPILER=gcc; LCG_RELEASE=LCG_96; STANDARD=17; COMPILER_VERSION=gcc8
- - COMPILER=gcc; LCG_RELEASE=LCG_96python3; STANDARD=17; COMPILER_VERSION=gcc8
- - COMPILER=clang; LCG_RELEASE=LCG_96; STANDARD=17; COMPILER_VERSION=clang8
- - COMPILER=gcc; LCG_RELEASE=LCG_96; STANDARD=14; COMPILER_VERSION=gcc62
+ - COMPILER=gcc; LCG_RELEASE=LCG_96b; STANDARD=17; COMPILER_VERSION=gcc8; PYTHON_CHECK="no"
+ - COMPILER=gcc; LCG_RELEASE=LCG_96python3; STANDARD=17; COMPILER_VERSION=gcc8; PYTHON_CHECK="no"
+ - COMPILER=clang; LCG_RELEASE=LCG_96b; STANDARD=17; COMPILER_VERSION=clang8; PYTHON_CHECK="no"
+ - COMPILER=gcc; LCG_RELEASE=LCG_96b; STANDARD=14; COMPILER_VERSION=gcc62; PYTHON_CHECK="no"
+ - PYTHON_CHECK="yes"; COMPILER=gcc; LCG_RELEASE=LCG_96b; STANDARD=17; COMPILER_VERSION=gcc8;
before_install:
- wget --no-check-certificate https://ecsft.cern.ch/dist/cvmfs/cvmfs-release/cvmfs-release-latest_all.deb
@@ -45,8 +46,13 @@ install:
# command to run tests
script:
- docker run -ti --name CI_container -v $PKGDIR:/DD4hep -e COMPILER_TYPE=$COMPILER -e LCG_RELEASE=${LCG_RELEASE} -e STANDARD=${STANDARD} -e COMPILER_VERSION=${COMPILER_VERSION} -v /cvmfs/sft.cern.ch:/cvmfs/sft.cern.ch -v /cvmfs/geant4.cern.ch:/cvmfs/geant4.cern.ch -v /cvmfs/clicdp.cern.ch:/cvmfs/clicdp.cern.ch -d clicdp/cc7-lcg /bin/bash
- - docker exec -ti CI_container /bin/bash -c "./DD4hep/.dd4hep-ci.d/compile_and_test.sh"
- - if [[ "${TRAVIS_EVENT_TYPE}" != "cron" && "${TRAVIS_EVENT_TYPE}" != "pull_request" && "${COMPILER}" == "gcc" && "${TRAVIS_REPO_SLUG%/*}" == "AIDASoft" ]];
+ - if [[ "$PYTHON_CHECK" == "yes" ]];
+ then docker exec -ti CI_container /bin/bash -c "./DD4hep/.dd4hep-ci.d/runPythonChecks.sh";
+ else docker exec -ti CI_container /bin/bash -c "./DD4hep/.dd4hep-ci.d/compile_and_test.sh";
+ fi
+
+after_success:
+ - if [[ "${TRAVIS_EVENT_TYPE}" != "cron" && "${TRAVIS_EVENT_TYPE}" != "pull_request" && "${COMPILER}" == "clang" && "${TRAVIS_REPO_SLUG%/*}" == "AIDASoft" ]];
then curl -X POST -F token=$GITLAB_TOKEN -F ref=master https://gitlab.cern.ch/api/v4/projects/7828/trigger/pipeline;
fi
--
GitLab