From 821c0554ef23cfefd3a368f833074965fa85527d Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Mon, 18 May 2020 17:00:01 +0200
Subject: [PATCH] TileCalorimeter: Move flake8 checking to build stage
---
.../TileCalib/TileCalibBlobPython/CMakeLists.txt | 12 ++----------
TileCalorimeter/TileConditions/CMakeLists.txt | 9 +--------
TileCalorimeter/TileConfiguration/CMakeLists.txt | 8 ++------
TileCalorimeter/TileCoolDcs/CMakeLists.txt | 12 ++----------
TileCalorimeter/TileCoolDcs/python/ProgressBar.py | 3 ++-
.../TileCoolDcs/python/TileDCSDataGrabber.py | 2 +-
.../TileCoolDcs/python/TileDCSDataInfo.py | 3 ++-
TileCalorimeter/TileCoolDcs/python/__init__.py | 2 +-
TileCalorimeter/TileCosmicAlgs/CMakeLists.txt | 8 ++------
TileCalorimeter/TileL2Algs/CMakeLists.txt | 8 ++------
TileCalorimeter/TileMonitoring/CMakeLists.txt | 9 ++-------
TileCalorimeter/TileRecAlgs/CMakeLists.txt | 9 ++-------
TileCalorimeter/TileRecUtils/CMakeLists.txt | 8 ++------
TileCalorimeter/TileSimAlgs/CMakeLists.txt | 8 ++------
14 files changed, 25 insertions(+), 76 deletions(-)
diff --git a/TileCalorimeter/TileCalib/TileCalibBlobPython/CMakeLists.txt b/TileCalorimeter/TileCalib/TileCalibBlobPython/CMakeLists.txt
index 37943a4c6a3..ef2e482ff36 100644
--- a/TileCalorimeter/TileCalib/TileCalibBlobPython/CMakeLists.txt
+++ b/TileCalorimeter/TileCalib/TileCalibBlobPython/CMakeLists.txt
@@ -9,14 +9,6 @@ atlas_subdir( TileCalibBlobPython )
find_package( cx_Oracle )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
-atlas_install_joboptions( share/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
+atlas_install_joboptions( share/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} --extend-ignore=F401,F821 )
atlas_install_scripts( share/*.py )
-
-atlas_add_test( flake8
- SCRIPT flake8 --select=ATL,F,E7,E9,W6 ${CMAKE_CURRENT_SOURCE_DIR}/python
- POST_EXEC_SCRIPT nopost.sh )
-
-atlas_add_test( flake8_share
- SCRIPT flake8 --select=ATL,F,E7,E9,W6 --ignore=F401,F821,ATL900,ATL901 ${CMAKE_CURRENT_SOURCE_DIR}/share
- POST_EXEC_SCRIPT nopost.sh )
diff --git a/TileCalorimeter/TileConditions/CMakeLists.txt b/TileCalorimeter/TileConditions/CMakeLists.txt
index d4a60773c20..d36e537a108 100644
--- a/TileCalorimeter/TileConditions/CMakeLists.txt
+++ b/TileCalorimeter/TileConditions/CMakeLists.txt
@@ -90,7 +90,7 @@ atlas_add_test( TileDCSComponents_test
# Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_joboptions( share/*.py )
atlas_install_runtime( share/*.txt share/Tile2003.* share/Tile2004.* share/TileDefault.* share/TileNo*.* share/dleak*.dat share/dsleak*.dat share/leak*.dat share/dpulse*.dat share/pulse*.dat share/noise*.dat share/ai_lo*.dat share/ai_hi*.dat share/bi_lo*.dat share/bi_hi*.dat share/ci_lo*.dat share/ci_hi*.dat share/DCS*.dat share/BadHVChannels.dat share/wiener*.dat)
@@ -126,10 +126,3 @@ if( NOT SIMULATIONBASE )
POST_EXEC_SCRIPT nopost.sh)
endif()
-
-
-# Check python syntax:
-atlas_add_test( flake8
- SCRIPT flake8 --select=ATL,F,E7,E9,W6 ${CMAKE_CURRENT_SOURCE_DIR}/python ${CMAKE_CURRENT_SOURCE_DIR}/test/*.py
- POST_EXEC_SCRIPT nopost.sh )
-
diff --git a/TileCalorimeter/TileConfiguration/CMakeLists.txt b/TileCalorimeter/TileConfiguration/CMakeLists.txt
index 15c1b7daf86..984219197d2 100644
--- a/TileCalorimeter/TileConfiguration/CMakeLists.txt
+++ b/TileCalorimeter/TileConfiguration/CMakeLists.txt
@@ -6,13 +6,9 @@
atlas_subdir( TileConfiguration )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
-
-# Check python syntax:
-atlas_add_test( flake8
- SCRIPT flake8 --select=ATL,F,E7,E9,W6 ${CMAKE_CURRENT_SOURCE_DIR}/python
- POST_EXEC_SCRIPT nopost.sh )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
+# Tests:
if( NOT SIMULATIONBASE )
atlas_add_test( TileConfigFlagsTest
diff --git a/TileCalorimeter/TileCoolDcs/CMakeLists.txt b/TileCalorimeter/TileCoolDcs/CMakeLists.txt
index 0879b8a6113..acc2cccb509 100644
--- a/TileCalorimeter/TileCoolDcs/CMakeLists.txt
+++ b/TileCalorimeter/TileCoolDcs/CMakeLists.txt
@@ -6,14 +6,6 @@
atlas_subdir( TileCoolDcs )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
-atlas_install_scripts( share/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
+atlas_install_scripts( share/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} --extend-ignore=F401,F821 )
atlas_install_runtime( share/*.dat )
-
-atlas_add_test( flake8
- SCRIPT flake8 --select=ATL,F,E7,E9,W6 ${CMAKE_CURRENT_SOURCE_DIR}/python
- POST_EXEC_SCRIPT nopost.sh )
-
-atlas_add_test( flake8_share
- SCRIPT flake8 --select=ATL,F,E7,E9,W6 --ignore=F401,F821,ATL900,ATL901 ${CMAKE_CURRENT_SOURCE_DIR}/share
- POST_EXEC_SCRIPT nopost.sh )
diff --git a/TileCalorimeter/TileCoolDcs/python/ProgressBar.py b/TileCalorimeter/TileCoolDcs/python/ProgressBar.py
index 5921a45dab8..b1d19400c39 100755
--- a/TileCalorimeter/TileCoolDcs/python/ProgressBar.py
+++ b/TileCalorimeter/TileCoolDcs/python/ProgressBar.py
@@ -1,4 +1,5 @@
-#!/bin/env python
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
import sys
class progressBar:
diff --git a/TileCalorimeter/TileCoolDcs/python/TileDCSDataGrabber.py b/TileCalorimeter/TileCoolDcs/python/TileDCSDataGrabber.py
index 31a420c1329..c24c9c79498 100755
--- a/TileCalorimeter/TileCoolDcs/python/TileDCSDataGrabber.py
+++ b/TileCalorimeter/TileCoolDcs/python/TileDCSDataGrabber.py
@@ -1,4 +1,4 @@
-#!/bin/env python
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Author: nils.gollub@cern.ch
from __future__ import print_function
diff --git a/TileCalorimeter/TileCoolDcs/python/TileDCSDataInfo.py b/TileCalorimeter/TileCoolDcs/python/TileDCSDataInfo.py
index 4601127c4eb..ba98bdcb723 100755
--- a/TileCalorimeter/TileCoolDcs/python/TileDCSDataInfo.py
+++ b/TileCalorimeter/TileCoolDcs/python/TileDCSDataInfo.py
@@ -1,4 +1,4 @@
-#!/bin/env python
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Author: nils.gollub@cern.ch
from __future__ import print_function
@@ -60,6 +60,7 @@ class TileDCSDataInfo:
"5VHV_OUTPUT_I" : [ LVPS_AI, type_float],
"5VHV_OUTPUT_V" : [ LVPS_AI, type_float],
"15VMB_INPUT_V" : [ LVPS_AI, type_float],
+
"5VHV_TEMP2" : [ LVPS_AI, type_float],
"5VHV_TEMP3" : [ LVPS_AI, type_float],
"15VHV_TEMP3" : [ LVPS_AI, type_float],
diff --git a/TileCalorimeter/TileCoolDcs/python/__init__.py b/TileCalorimeter/TileCoolDcs/python/__init__.py
index 36af10244e7..72e682f2696 100755
--- a/TileCalorimeter/TileCoolDcs/python/__init__.py
+++ b/TileCalorimeter/TileCoolDcs/python/__init__.py
@@ -1,4 +1,4 @@
-# File TileCoolDcs/python/__init__.py
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Author: nils.gollub@cern.ch
__author__="Nils Gollub"
diff --git a/TileCalorimeter/TileCosmicAlgs/CMakeLists.txt b/TileCalorimeter/TileCosmicAlgs/CMakeLists.txt
index 8de98fe6659..4484267451a 100644
--- a/TileCalorimeter/TileCosmicAlgs/CMakeLists.txt
+++ b/TileCalorimeter/TileCosmicAlgs/CMakeLists.txt
@@ -34,14 +34,10 @@ atlas_add_component( TileCosmicAlgs
# Install files from the package:
atlas_install_headers( TileCosmicAlgs )
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_joboptions( share/*.py )
-# Check python syntax:
-atlas_add_test( flake8
- SCRIPT flake8 --select=ATL,F,E7,E9,W6 ${CMAKE_CURRENT_SOURCE_DIR}/python
- POST_EXEC_SCRIPT nopost.sh )
-
+# Tests:
atlas_add_test( TileMuonFitterConfig_test
SCRIPT python -m TileCosmicAlgs.TileMuonFitterConfig
PROPERTIES TIMEOUT 300
diff --git a/TileCalorimeter/TileL2Algs/CMakeLists.txt b/TileCalorimeter/TileL2Algs/CMakeLists.txt
index 2b5d846a62d..4591d877132 100644
--- a/TileCalorimeter/TileL2Algs/CMakeLists.txt
+++ b/TileCalorimeter/TileL2Algs/CMakeLists.txt
@@ -31,14 +31,10 @@ atlas_add_component( TileL2Algs
LINK_LIBRARIES TileL2AlgsLib )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_joboptions( share/*.py )
-# Check python syntax:
-atlas_add_test( flake8
- SCRIPT flake8 --select=ATL,F,E7,E9,W6 ${CMAKE_CURRENT_SOURCE_DIR}/python
- POST_EXEC_SCRIPT nopost.sh )
-
+# Tests:
atlas_add_test( TileL2Config_test
SCRIPT python -m TileL2Algs.TileL2Config
PROPERTIES TIMEOUT 300
diff --git a/TileCalorimeter/TileMonitoring/CMakeLists.txt b/TileCalorimeter/TileMonitoring/CMakeLists.txt
index 70ebbf7be69..edb3d276da5 100644
--- a/TileCalorimeter/TileMonitoring/CMakeLists.txt
+++ b/TileCalorimeter/TileMonitoring/CMakeLists.txt
@@ -1,4 +1,3 @@
-# $Id: CMakeLists.txt 767269 2016-08-10 15:10:39Z aryzhov $
################################################################################
# Package: TileMonitoring
################################################################################
@@ -56,14 +55,10 @@ atlas_add_component( TileMonitoring
# Install files from the package:
atlas_install_headers( TileMonitoring )
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_joboptions( share/*.py )
-# Check python syntax:
-atlas_add_test( flake8
- SCRIPT flake8 --select=ATL,F,E7,E9,W6 ${CMAKE_CURRENT_SOURCE_DIR}/python ${CMAKE_CURRENT_SOURCE_DIR}/test/*.py
- POST_EXEC_SCRIPT nopost.sh )
-
+# Tests:
atlas_add_test( TileCellMonitorAlgorithm_test
SCRIPT python -m TileMonitoring.TileCellMonitorAlgorithm
PROPERTIES TIMEOUT 300
diff --git a/TileCalorimeter/TileRecAlgs/CMakeLists.txt b/TileCalorimeter/TileRecAlgs/CMakeLists.txt
index 699eb266d6a..70e3e123be1 100644
--- a/TileCalorimeter/TileRecAlgs/CMakeLists.txt
+++ b/TileCalorimeter/TileRecAlgs/CMakeLists.txt
@@ -51,15 +51,10 @@ set_target_properties( TileRecAlgs_TileDigitsThresholdFilter_test PROPERTIES ENA
# Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_joboptions( share/*.py )
-# Check python syntax:
-atlas_add_test( flake8
- SCRIPT flake8 --select=ATL,F,E7,E9,W6 ${CMAKE_CURRENT_SOURCE_DIR}/python
- POST_EXEC_SCRIPT nopost.sh )
-
-
+# Tests:
atlas_add_test( MBTSTimeDiffEventInfoAlgConfig_test
SCRIPT python -m TileRecAlgs.MBTSTimeDiffEventInfoAlgConfig
PROPERTIES TIMEOUT 300
diff --git a/TileCalorimeter/TileRecUtils/CMakeLists.txt b/TileCalorimeter/TileRecUtils/CMakeLists.txt
index ce29185c03a..f4aad325014 100644
--- a/TileCalorimeter/TileRecUtils/CMakeLists.txt
+++ b/TileCalorimeter/TileRecUtils/CMakeLists.txt
@@ -53,7 +53,7 @@ atlas_add_component( TileRecUtils
LINK_LIBRARIES TileRecUtilsLib )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_joboptions( share/*.py )
atlas_add_dictionary( TileRecUtilsDict
@@ -96,11 +96,7 @@ atlas_add_test( TileDQstatusTool_test
PROPERTIES TIMEOUT 600
LOG_IGNORE_PATTERN "LArDetectorToolNV|is still valid|no data retrieved|Database being retired|Reading file|Unable to locate catalog|Resolved path|DigitizationFlags|^Domain|created CondCont|no dictionary for class|^ +[+]|Reading LArPedestalMC|IOV callback|^DetectorStore|TileDetectorTool|Creating TileCondProxyFile|Cache alignment|No RecFlags available" )
-# Check python syntax:
-atlas_add_test( flake8
- SCRIPT flake8 --select=ATL,F,E7,E9,W6 ${CMAKE_CURRENT_SOURCE_DIR}/python ${CMAKE_CURRENT_SOURCE_DIR}/test/*.py
- POST_EXEC_SCRIPT nopost.sh )
-
+# Tests:
atlas_add_test( TileRawChannelBuilderFitConfig_test
SCRIPT python -m TileRecUtils.TileRawChannelBuilderFitConfig
PROPERTIES TIMEOUT 300
diff --git a/TileCalorimeter/TileSimAlgs/CMakeLists.txt b/TileCalorimeter/TileSimAlgs/CMakeLists.txt
index 57e24ad519c..6bf73dc4214 100644
--- a/TileCalorimeter/TileSimAlgs/CMakeLists.txt
+++ b/TileCalorimeter/TileSimAlgs/CMakeLists.txt
@@ -40,14 +40,10 @@ atlas_add_component( TileSimAlgs
# Install files from the package:
atlas_install_headers( TileSimAlgs )
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_joboptions( share/*.py )
-# Check python syntax:
-atlas_add_test( flake8
- SCRIPT flake8 --select=ATL,F,E7,E9,W6 ${CMAKE_CURRENT_SOURCE_DIR}/python ${CMAKE_CURRENT_SOURCE_DIR}/test/*.py
- POST_EXEC_SCRIPT nopost.sh )
-
+# Tests:
atlas_add_test( TileMuonReceiverConfig_test
SCRIPT python -m TileSimAlgs.TileMuonReceiverConfig
PROPERTIES TIMEOUT 300
--
GitLab