Merge pull request #59 from spencer-tb/tox-naming-convention

Additional Tox Checks: pep8-naming and fname8 for correct python naming conventions

Author: spencer-tb

setup.cfg

@@ -51,27 +51,32 @@ lint =
     black==22.3.0; implementation_name == "cpython"
     flake8-spellcheck>=0.24,<0.25
     flake8-docstrings>=1.6,<2
-    flake8>=3.9,<4
+    flake8>=5,<=6
+    pep8-naming==0.13.3
+    fname8>=0.0.3
 
 [flake8]
 dictionaries=en_US,python,technical
 docstring-convention = all
-extend-ignore =
-    E203    # Ignore: Whitespace before ':'
-    D107    # Ignore: Missing docstring in __init__
-    D200    # Ignore: One-line docstring should fit on one line with quotes
-    D203    # Ignore: 1 blank line required before class docstring
-    D205    # Ignore: blank line required between summary line and description
-    D212    # Ignore: Multi-line docstring summary should start at the first line
-    D400    # Ignore: First line should end with a period
-    D401    # Ignore: First line should be in imperative mood
-    D410    # Ignore: Missing blank line after section
-    D411    # Ignore: Missing blank line before section
-    D412    # Ignore: No blank lines allowed between a section header and its content
-    D413    # Ignore: Missing blank line after last section
-    D414    # Ignore: Section has no content
-    D415    # Ignore: First line should end with a period, question mark, or exclamation point
-    D416    # Ignore: Section name should end with a colon
+extend-ignore = E203, D107, D200, D203, D205,
+    D212, D400, D401, D410, D411, D412, D413,
+    D414, D415, D416, N806 
+    # Ignore E203: Whitespace before ':'
+    # Ignore D107: Missing docstring in __init__
+    # Ignore D200: One-line docstring should fit on one line with quotes
+    # Ignore D203: 1 blank line required before class docstring
+    # Ignore D205: blank line required between summary line and description
+    # Ignore D212: Multi-line docstring summary should start at the first line
+    # Ignore D400: First line should end with a period
+    # Ignore D401: First line should be in imperative mood
+    # Ignore D410: Missing blank line after section
+    # Ignore D411: Missing blank line before section
+    # Ignore D412: No blank lines allowed between a section header and its content
+    # Ignore D413: Missing blank line after last section
+    # Ignore D414: Section has no content
+    # Ignore D415: First line should end with a period, question mark, or exclamation point
+    # Ignore D416: Section name should end with a colon
+    # Ignore N806: Variable names with all caps (ALL_CAPS)
 per-file-ignore =
     tests/evm_transition_tool/test_evaluate.py:E501
 

src/evm_block_builder/__init__.py

@@ -24,7 +24,7 @@ def build(
         withdrawals: Optional[Any] = None,
         clique: Optional[Any] = None,
         ethash: bool = False,
-        ethashMode: str = "normal",
+        ethash_mode: str = "normal",
     ) -> Tuple[str, str]:
         """
         Build a block with specified parameters and return RLP and hash
@@ -68,7 +68,7 @@ def build(
         withdrawals: Optional[Any] = None,
         clique: Optional[Any] = None,
         ethash: bool = False,
-        ethashMode: str = "normal",
+        ethash_mode: str = "normal",
     ) -> Tuple[str, str]:
         """
         Executes `evm b11r` with the specified arguments.
@@ -85,7 +85,7 @@ def build(
 
         if ethash:
             args.append("--seal.ethash")
-            args.append("--seal.ethash.mode=" + ethashMode)
+            args.append("--seal.ethash.mode=" + ethash_mode)
 
         stdin = {
             "header": header,
@@ -118,7 +118,6 @@ def version(self) -> str:
         Gets `evm` binary version.
         """
         if self.cached_version is None:
-
             result = subprocess.run(
                 [str(self.binary), "-v"],
                 stdout=subprocess.PIPE,

tox.ini

@@ -6,6 +6,7 @@ extras =
     test
     lint
 commands =
+    fname8 src fillers
     isort src fillers setup.py --check --diff
     black src fillers setup.py --check --diff
     flake8 src fillers setup.py