Support flake8 v5+ (#2)

* Rename "CLST" to "CSM" in codes.
* Removed support for Python 3.7 and added 3.10 and 3.11.
* Fix Github actions.

.github/workflows/python-black.yml

@@ -7,7 +7,7 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: [3.8]
+        python-version: [3.11]
 
     steps:
       - uses: actions/checkout@v1

.github/workflows/python-tox.yml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: [3.7, 3.8]
+        python-version: ["3.8", "3.9", "3.10", "3.11"]
 
     steps:
       - uses: actions/checkout@v1

README.md

@@ -7,17 +7,17 @@ flake8 plugin that checks rules regarding the staticmethod and classmethod decor
 
 ## Options
 
-The plugin offers one flag, `--select_clst1`, accepting a list of error
+The plugin offers one flag, `--select_csm1`, accepting a list of error
 codes (see below) to be enabled. By default, the enabled errors
-are `CLST101` and `CLST131`.
+are `CSM101` and `CSM131`.
 
 ## Error Codes
 
-### CLST100
+### CSM100
 
 `@staticmethod` should not be used.
 
-### CLST101
+### CSM101
 
 A method marked as `@staticmethod` should not reference the class it
 is defined in. Use `@classmethod` otherwise.
@@ -38,7 +38,7 @@ class MyClass:
         return cls.__name__
 ```
 
-### CLST102
+### CSM102
 
 Do not inherit and override a method marked as `@staticmethod`.
 
@@ -63,11 +63,11 @@ class MyClass:
         return cls.__name__
 ```
 
-### CLST130
+### CSM130
 
 `@classmethod` should not be used.
 
-### CLST131
+### CSM131
 
 A method marked as `@classmethod` should access the parameter `cls`.
 Use `@staticmethod` otherwise.
@@ -88,7 +88,7 @@ class MyClass:
         return "MyClass"
 ```
 
-### CLST132
+### CSM132
 A method marked as `@classmethod` should not reference the class it
 is defined in. Use the `cls` parameter.
 

flake8_classmethod_staticmethod/checker.py

@@ -6,12 +6,10 @@
 import flake8.options.manager
 
 DEFAULT_SELECT = [
-    "CLST101",
-    "CLST131",
+    "CSM101",
+    "CSM131",
 ]
 
-PYTHON_38 = sys.version_info >= (3, 8)
-
 
 class Checker:
     """
@@ -28,7 +26,7 @@ def __init__(self, tree: ast.AST):
     @staticmethod
     def add_options(option_manager: flake8.options.manager.OptionManager):
         option_manager.add_option(
-            "--select_clst1",
+            "--select_csm1",
             type=str,
             comma_separated_list=True,
             default=DEFAULT_SELECT,
@@ -43,9 +41,7 @@ def parse_options(
         options: argparse.Namespace,
         extra_args,
     ):
-        cls.enabled_errors = [
-            int(option[4:]) for option in options.select_clst1
-        ]
+        cls.enabled_errors = [int(option[3:]) for option in options.select_csm1]
 
     def run(self) -> Iterable[Tuple[int, int, str, type]]:
         for cls_node in ast.walk(self.tree):
@@ -66,16 +62,16 @@ def _check_function_node(self, fn_node: ast.FunctionDef, classname: str):
         )
         if is_staticmethod:
             if 100 in self.enabled_errors:
-                yield from _clst100(fn_node)
+                yield from _csm100(fn_node)
             if 101 in self.enabled_errors:
-                yield from _clst101(fn_node, classname)
+                yield from _csm101(fn_node, classname)
         if is_classmethod:
             if 130 in self.enabled_errors:
-                yield from _clst130(fn_node)
+                yield from _csm130(fn_node)
             if 131 in self.enabled_errors:
-                yield from _clst131(fn_node)
+                yield from _csm131(fn_node)
             if 132 in self.enabled_errors:
-                yield from _clst132(fn_node, classname)
+                yield from _csm132(fn_node, classname)
 
 
 ERROR_MESSAGES = {
@@ -98,16 +94,16 @@ def _error_tuple(error_code: int, node: ast.AST) -> Tuple[int, int, str, type]:
     return (
         node.lineno,
         node.col_offset,
-        f"CLST{error_code} {ERROR_MESSAGES[error_code]}",
+        f"CSM{error_code} {ERROR_MESSAGES[error_code]}",
         Checker,
     )
 
 
-def _clst100(node: ast.FunctionDef) -> Iterable[Tuple[int, int, str, type]]:
+def _csm100(node: ast.FunctionDef) -> Iterable[Tuple[int, int, str, type]]:
     yield _error_tuple(100, node)
 
 
-def _clst101(
+def _csm101(
     node: ast.FunctionDef, classname: str
 ) -> Iterable[Tuple[int, int, str, type]]:
     references_class = any(
@@ -118,18 +114,18 @@ def _clst101(
         yield _error_tuple(101, node)
 
 
-def _clst130(node: ast.FunctionDef) -> Iterable[Tuple[int, int, str, type]]:
+def _csm130(node: ast.FunctionDef) -> Iterable[Tuple[int, int, str, type]]:
     yield _error_tuple(130, node)
 
 
-def _clst131(node: ast.FunctionDef) -> Iterable[Tuple[int, int, str, type]]:
+def _csm131(node: ast.FunctionDef) -> Iterable[Tuple[int, int, str, type]]:
     if node.args.args:
         cls_param = node.args.args[0].arg
         if not _function_uses_identifier(node, cls_param):
             yield _error_tuple(131, node)
 
 
-def _clst132(
+def _csm132(
     node: ast.FunctionDef, classname: str
 ) -> Iterable[Tuple[int, int, str, type]]:
     if _function_uses_identifier(node, classname):

requirements/py310.txt

@@ -0,0 +1,3 @@
+flake8>=5,<6
+pytest-flake8-path>=1.5.0,<2
+pytest>=7,<8

requirements/py311.txt

@@ -0,0 +1,3 @@
+flake8>=5,<6
+pytest-flake8-path>=1.5.0,<2
+pytest>=7,<8

requirements/py38.txt

@@ -1,3 +1,3 @@
-flake8>=3.0,<4
-pytest-flake8dir>=2.2,<3
-pytest>=5.4,<6
+flake8>=5,<6
+pytest-flake8-path>=1.5.0,<2
+pytest>=7,<8

requirements/py39.txt

@@ -1,3 +1,3 @@
-flake8>=3.0,<4
-pytest-flake8dir>=2.2,<3
-pytest>=5.4,<6
+flake8>=5,<6
+pytest-flake8-path>=1.5.0,<2
+pytest>=7,<8

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = flake8-classmethod-staticmethod
-version = 1.0
+version = 2.0
 description = flake8 plugin that checks rules regarding the staticmethod and classmethod decorators.
 long_description = file: README.md
 long_description_content_type = text/markdown
@@ -16,18 +16,19 @@ classifiers =
     Natural Language :: English
     Programming Language :: Python :: 3 :: Only
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
+    Programming Language :: Python :: 3.11
 
 [options]
 packages =
     flake8_classmethod_staticmethod
 include_package_data = True
-python_requires = >=3.7
+python_requires = >=3.8
 zip_safe = False
 
 [options.entry_points]
 flake8.extension =
-    CLST1 = flake8_classmethod_staticmethod.checker:Checker
+    CSM1 = flake8_classmethod_staticmethod.checker:Checker
 

tests/test_clst100.py

@@ -1,10 +1,9 @@
-from flake8_classmethod_staticmethod.checker import PYTHON_38
 from tests.util import BaseTest
 
 
-class Test_CLST100(BaseTest):
+class Test_CSM100(BaseTest):
     def error_code(self) -> str:
-        return "CLST100"
+        return "CSM100"
 
     def test_pass_1(self):
         code = """
@@ -27,4 +26,4 @@ def bar():
                 pass
         """
         result = self.run_flake8(code)
-        self.assert_error_at(result, "CLST100", 3 if PYTHON_38 else 2, 5)
+        self.assert_error_at(result, "CSM100", 4, 5)

tests/test_clst101.py

@@ -1,10 +1,9 @@
-from flake8_classmethod_staticmethod.checker import PYTHON_38
 from tests.util import BaseTest
 
 
-class Test_CLST101(BaseTest):
+class Test_CSM101(BaseTest):
     def error_code(self) -> str:
-        return "CLST101"
+        return "CSM101"
 
     def test_pass_1(self):
         code = """
@@ -37,4 +36,4 @@ def bar():
                 return Foo.__name__
         """
         result = self.run_flake8(code)
-        self.assert_error_at(result, "CLST101", 3 if PYTHON_38 else 2, 5)
+        self.assert_error_at(result, "CSM101", 4, 5)

tests/test_clst130.py

@@ -1,10 +1,9 @@
-from flake8_classmethod_staticmethod.checker import PYTHON_38
 from tests.util import BaseTest
 
 
-class Test_CLST130(BaseTest):
+class Test_CSM130(BaseTest):
     def error_code(self) -> str:
-        return "CLST130"
+        return "CSM130"
 
     def test_pass_1(self):
         code = """
@@ -27,4 +26,4 @@ def bar(cls):
                 pass
         """
         result = self.run_flake8(code)
-        self.assert_error_at(result, "CLST130", 3 if PYTHON_38 else 2, 5)
+        self.assert_error_at(result, "CSM130", 4, 5)

tests/test_clst131.py

@@ -1,10 +1,9 @@
-from flake8_classmethod_staticmethod.checker import PYTHON_38
 from tests.util import BaseTest
 
 
-class Test_CLST131(BaseTest):
+class Test_CSM131(BaseTest):
     def error_code(self) -> str:
-        return "CLST131"
+        return "CSM131"
 
     def test_pass_1(self):
         code = """
@@ -40,4 +39,4 @@ def bar(cls):
                 return 123
         """
         result = self.run_flake8(code)
-        self.assert_error_at(result, "CLST131", 3 if PYTHON_38 else 2, 5)
+        self.assert_error_at(result, "CSM131", 4, 5)

tests/test_clst132.py

@@ -1,10 +1,9 @@
-from flake8_classmethod_staticmethod.checker import PYTHON_38
 from tests.util import BaseTest
 
 
-class Test_CLST132(BaseTest):
+class Test_CSM132(BaseTest):
     def error_code(self) -> str:
-        return "CLST132"
+        return "CSM132"
 
     def test_pass_1(self):
         code = """
@@ -41,4 +40,4 @@ def bar(cls):
                 return Foo.__name__
         """
         result = self.run_flake8(code)
-        self.assert_error_at(result, "CLST132", 3 if PYTHON_38 else 2, 5)
+        self.assert_error_at(result, "CSM132", 4, 5)

tests/test_general.py

@@ -2,7 +2,7 @@
 
 
 class Test_General:
-    def test_pass_1(self, flake8dir):
+    def test_pass_1(self, flake8_path):
         code = """
         class Foo:
             @some_decorator(123)  # noqa
@@ -12,8 +12,7 @@ def bar(self):
             @other.decorator(key=123)  # noqa
             def baz(self):
                 pass
-        
         """
-        flake8dir.make_example_py(textwrap.dedent(code))
-        result = flake8dir.run_flake8()
+        (flake8_path / "example.py").write_text(textwrap.dedent(code))
+        result = flake8_path.run_flake8()
         assert result.exit_code == 0

tests/util.py

@@ -27,13 +27,13 @@ def error_code(self) -> str:
         raise NotImplementedError
 
     @pytest.fixture(autouse=True)
-    def _flake8dir(self, flake8dir):
-        self.flake8dir = flake8dir
+    def _flake8dir(self, flake8_path):
+        self.flake8_path = flake8_path
 
     def run_flake8(self, code: str) -> List[ReportedMessage]:
-        self.flake8dir.make_example_py(textwrap.dedent(code))
-        args = [f"--select_clst1={self.error_code()}"]
-        result = self.flake8dir.run_flake8(args)
+        (self.flake8_path / "example.py").write_text(textwrap.dedent(code))
+        args = [f"--select_csm1={self.error_code()}"]
+        result = self.flake8_path.run_flake8(args)
         return [ReportedMessage.from_raw(report) for report in result.out_lines]
 
     def assert_error_at(