From 01b6a2ba6af30e02a48a5c2ad1d82ba94b83026b Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Thu, 30 Apr 2020 12:14:12 +0200
Subject: [PATCH] Projects: Changes to default flake8 configuration
- Revert running with a single process as this was not the cause for
timeouts (ATLINFR-3046) and increases the time for local builds.
- Use `--ignore` instead of `--extend-ignore` for our default ignore
list. This allows developers to use the latter to extend the ignore
list at the package level if needed.
- Add `E101` (mixed tabs/spaces) to the list of selected errors.
---
Projects/AthGeneration/CMakeLists.txt | 2 +-
Projects/Athena/CMakeLists.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Projects/AthGeneration/CMakeLists.txt b/Projects/AthGeneration/CMakeLists.txt
index ac18de096d9..a69f765b983 100644
--- a/Projects/AthGeneration/CMakeLists.txt
+++ b/Projects/AthGeneration/CMakeLists.txt
@@ -8,7 +8,7 @@ project( AthGeneration VERSION ${_version} LANGUAGES C CXX Fortran )
unset( _version )
# Configure flake8:
-set( ATLAS_FLAKE8 "flake8_atlas --select ATL,F,E7,E9,W6 --enable-extension ATL902 --extend-ignore E701,E702,E741"
+set( ATLAS_FLAKE8 "flake8_atlas --select ATL,F,E101,E7,E9,W6 --ignore ATL238,ATL9,E701,E702,E704,E741 --enable-extensions ATL902"
CACHE STRING "Default flake8 command" )
set( ATLAS_PYTHON_CHECKER "${ATLAS_FLAKE8} --filterFiles AthenaConfiguration"
diff --git a/Projects/Athena/CMakeLists.txt b/Projects/Athena/CMakeLists.txt
index a21c2cb2134..c79c975a593 100644
--- a/Projects/Athena/CMakeLists.txt
+++ b/Projects/Athena/CMakeLists.txt
@@ -41,7 +41,7 @@ mark_as_advanced( TDAQ-COMMON_ATROOT TDAQ_PROJECT_NAME
TDAQ_ATROOT )
# Configure flake8:
-set( ATLAS_FLAKE8 "flake8_atlas -j 1 --select ATL,F,E7,E9,W6 --enable-extension ATL902 --extend-ignore E701,E702,E741"
+set( ATLAS_FLAKE8 "flake8_atlas --select ATL,F,E101,E7,E9,W6 --ignore ATL238,ATL9,E701,E702,E704,E741 --enable-extensions ATL902"
CACHE STRING "Default flake8 command" )
set( ATLAS_PYTHON_CHECKER "${ATLAS_FLAKE8} --filterFiles AthenaConfiguration"
--
GitLab