From 82978677bcae6aa0c173fc7c2a7baefcfcf503b5 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Mon, 18 May 2020 17:16:03 +0200
Subject: [PATCH] MuonSpectrometer: Move flake8 checking to build stage
---
MuonSpectrometer/MuonCalib/MuonCalibAlgs/CMakeLists.txt | 6 +-----
.../CalibNtupleAnalysisAlg/CMakeLists.txt | 6 +-----
.../MuonCondGeneral/MuonCondCool/CMakeLists.txt | 6 +-----
.../MuonCondCool/share/makeRpcTriggerScripts.py | 4 +---
4 files changed, 4 insertions(+), 18 deletions(-)
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibAlgs/CMakeLists.txt b/MuonSpectrometer/MuonCalib/MuonCalibAlgs/CMakeLists.txt
index c6ecbab52ec..e360e754467 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibAlgs/CMakeLists.txt
+++ b/MuonSpectrometer/MuonCalib/MuonCalibAlgs/CMakeLists.txt
@@ -58,8 +58,4 @@ atlas_add_component( MuonCalibAlgs
# Install files from the package:
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
-atlas_install_joboptions( share/*.py )
-
-atlas_add_test( flake8_share
- SCRIPT flake8 --select=ATL,F,E7,E9,W6 --ignore=F401,F821,ATL900 ${CMAKE_CURRENT_SOURCE_DIR}/share
- POST_EXEC_SCRIPT nopost.sh )
+atlas_install_joboptions( share/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} --extend-ignore=F401,F821 )
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/CalibNtupleAnalysisAlg/CMakeLists.txt b/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/CalibNtupleAnalysisAlg/CMakeLists.txt
index 0ff9c728305..0f364468ef8 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/CalibNtupleAnalysisAlg/CMakeLists.txt
+++ b/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/CalibNtupleAnalysisAlg/CMakeLists.txt
@@ -58,8 +58,4 @@ atlas_add_dictionary( CalibNtupleAnalysisAlgDict
# Install files from the package:
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
-atlas_install_joboptions( share/*.py )
-
-atlas_add_test( flake8_share
- SCRIPT flake8 --select=ATL,F,E7,E9,W6 --ignore=F401,F821,ATL900 ${CMAKE_CURRENT_SOURCE_DIR}/share
- POST_EXEC_SCRIPT nopost.sh )
+atlas_install_joboptions( share/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} --extend-ignore=F401,F821 )
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/CMakeLists.txt b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/CMakeLists.txt
index b1c9f14d841..305bc7372d8 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/CMakeLists.txt
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/CMakeLists.txt
@@ -27,8 +27,4 @@ atlas_add_component( MuonCondCool
# Install files from the package:
atlas_install_headers( MuonCondCool )
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
-atlas_install_joboptions( share/*.py )
-
-atlas_add_test( flake8_share
- SCRIPT flake8 --select=ATL,F,E7,E9,W6 --ignore=F401,F821,ATL900 ${CMAKE_CURRENT_SOURCE_DIR}/share
- POST_EXEC_SCRIPT nopost.sh )
+atlas_install_joboptions( share/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} --extend-ignore=F401,F821 )
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/share/makeRpcTriggerScripts.py b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/share/makeRpcTriggerScripts.py
index 20c19b23305..2735ca73fef 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/share/makeRpcTriggerScripts.py
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/share/makeRpcTriggerScripts.py
@@ -187,7 +187,6 @@ MessageSvc.OutputLevel = VERBOSE
# big loop over all directories
for i in range(len(EtaSXX)):
-
# take care of eta
#------------------------------
EtaSXXi= EtaSXX[i].strip('\n')
@@ -223,7 +222,7 @@ for i in range(len(EtaSXX)):
for j in range(len(EtaSXXmu6)):
EtaChannel+= 1
printfunc ("low pt EtaChannel= ", EtaChannel)
-
+
EtaSXXmu6[j]=EtaSXXmu6[j].strip('\n')
fileSuffix= EtaSXXmu6[j].split('_')[4]
EtaName_CM6= EtaSXXmu6[j].replace('_'+fileSuffix,'')
@@ -250,7 +249,6 @@ for i in range(len(EtaSXX)):
#loop over phi files
for j in range(len(PhiSXXmu)):
-
PhiChannel+= 1
printfunc ("PhiChannel= ", PhiChannel)
PhiSXXmu[j]=PhiSXXmu[j].strip('\n')
--
GitLab