From 085f358007f817ff1c1e397930b8097287af1898 Mon Sep 17 00:00:00 2001
From: Jan-Erik Rediger <jrediger@mozilla.com>
Date: Tue, 2 Aug 2022 13:24:32 +0200
Subject: [PATCH] Upgrade flake8-bugbear & fix linting

---
 .flake8              | 2 --
 requirements_dev.txt | 2 +-
 setup.cfg            | 1 +
 tests/test_kotlin.py | 8 ++++----
 4 files changed, 6 insertions(+), 7 deletions(-)
 delete mode 100644 .flake8

diff --git a/.flake8 b/.flake8
deleted file mode 100644
index 2bcd70e3..00000000
--- a/.flake8
+++ /dev/null
@@ -1,2 +0,0 @@
-[flake8]
-max-line-length = 88
diff --git a/requirements_dev.txt b/requirements_dev.txt
index 3171f490..69e6d563 100644
--- a/requirements_dev.txt
+++ b/requirements_dev.txt
@@ -2,7 +2,7 @@ black==22.3.0
 coverage==6.4.1; python_version > '3.6'
 coverage==6.2; python_version <= '3.6'
 flake8==5.0.3
-flake8-bugbear==22.4.25
+flake8-bugbear==22.7.1
 mypy==0.971
 pip
 pytest-runner==5.3.1
diff --git a/setup.cfg b/setup.cfg
index 3408341c..ea89188c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,6 +3,7 @@ python_tag = py3
 
 [flake8]
 exclude = docs
+max-line-length = 88
 
 [aliases]
 test = pytest
diff --git a/tests/test_kotlin.py b/tests/test_kotlin.py
index bc3b07d8..d2f8e9ab 100644
--- a/tests/test_kotlin.py
+++ b/tests/test_kotlin.py
@@ -299,7 +299,7 @@ def test_gecko_datapoints(tmpdir):
             "GV_PAGE_RELOAD_MS" -> PagePerf.reloadTime
             else -> null
         }
-    }"""
+    }"""  # noqa
 
         assert expected_func in content
 
@@ -321,7 +321,7 @@ def test_gecko_datapoints(tmpdir):
             "gfx_adapter.stand_alone" -> GfxInfoAdapter.standAlone
             else -> null
         }
-    }"""
+    }"""  # noqa
 
         assert expected_func in content
 
@@ -331,7 +331,7 @@ def test_gecko_datapoints(tmpdir):
             "gfx_adapter.vendor_id" -> GfxInfoAdapter.vendorId
             else -> null
         }
-    }"""
+    }"""  # noqa
 
         assert expected_func in content
 
@@ -341,7 +341,7 @@ def test_gecko_datapoints(tmpdir):
             "gfx_adapter.width" -> GfxInfoAdapter.screenWidth
             else -> null
         }
-    }"""
+    }"""  # noqa
 
         assert expected_func in content