Fix remaining linting issues, and add flake8 to 'analyze' job in GitHub Actions

5 files changed, 11 insertions, 4 deletions

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f86b63f..45b06d4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -87,10 +87,12 @@ jobs:
       - name: Install dependencies
         run: pip install ".[dev]"
 
-      - name: Run black check
-        run: black --check --diff .
-      - name: Run isort check
-        run: isort --check --diff .
+      - name: Run linter
+        run: flake8 .
+      - name: Run code style checks
+        run: |
+          black --check --diff .
+          isort --check --diff .
       - name: Run cyclomatic complexity check
         run: radon cc --show-complexity --average --order SCORE requests_cache
 
diff --git a/examples/basic_usage.py b/examples/basic_usage.py
index 3888681..5234e43 100644
--- a/examples/basic_usage.py
+++ b/examples/basic_usage.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+# flake8: noqa: F841
 """A Simple example using requests-cache with httpbin"""
 import time
 
diff --git a/examples/session_patch.py b/examples/session_patch.py
index 8ae900b..f84e72e 100644
--- a/examples/session_patch.py
+++ b/examples/session_patch.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+# flake8: noqa: F841
 """The same as `basic_usage.py`, but using global session patching"""
 import time
 
diff --git a/setup.cfg b/setup.cfg
index 216ff4c..74d39a8 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -24,6 +24,7 @@ classifiers =
 
 [flake8]
 max_line_length = 120
+select = E,F,W,C4,C90
 exclude = __pycache__,.tox,build,dist,test,venv
 # Defer these rules to black:
 ignore =
diff --git a/setup.py b/setup.py
index 92426d7..e36b830 100644
--- a/setup.py
+++ b/setup.py
@@ -22,6 +22,8 @@ extras_require = {
     'test': [
         'black==20.8b1',
         'flake8',
+        'flake8-comprehensions',
+        'flake8-polyfill',
         'isort',
         'pre-commit',
         'psutil',