Merging upstream version 10.0.0+dfsg.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 6 insertions, 11 deletions

diff --git a/ansible_collections/cisco/ios/.flake8 b/ansible_collections/cisco/ios/.flake8
index 4795515e8..03be69242 100644
--- a/ansible_collections/cisco/ios/.flake8
+++ b/ansible_collections/cisco/ios/.flake8
@@ -39,19 +39,14 @@ extend-exclude =
 # IMPORTANT: avoid using ignore option, always use extend-ignore instead
 # Completely and unconditionally ignore the following errors:
 extend-ignore =
-  # Safeguard neutering of flake8-quotes : https://github.com/zheller/flake8-quotes/issues/105
-  Q,
-  # annoy black by allowing white space before : https://github.com/psf/black/issues/315
-  E203,
-  # duplicate of pylint W0611 (unused-import)
-  F401,
-  # duplicate of pylint E0602 (undefined-variable)
-  F821,
-  # duplicate of pylint W0612 (unused-variable)
   F841,
+  # line-length
+  E501,
+  # module level import not at top of file
+  E402
 
 # Accessibility/large fonts and PEP8 unfriendly:
-max-line-length = 100
+max-line-length = 120
 
 # Allow certain violations in certain files:
 # Please keep both sections of this list sorted, as it will be easier for others to find and add entries in the future
@@ -62,7 +57,7 @@ per-file-ignores =
   # these will need to be added to that line as well.
 
 
-   # S101: Allow the use of assert within the tests directory, since tests require it.
+  # S101: Allow the use of assert within the tests directory, since tests require it.
   tests/**.py: S101
 
   # The following were present during the initial implementation.