Update flake8 and fix errors (WebAssembly#7172)

The flake8 we were running on CI was too old and began giving spurious
errors about the uninterpreted contents of f-strings. Update to the
latest flake8 and fix all the new errors, including the previously
incorrect comment syntax in the .flake8 file.

Also remove scripts/storage.py, since it didn't seem to be used for
anything we currently need.

Author: tlively

.flake8

@@ -1,6 +1,9 @@
 [flake8]
 ignore =
-  E501, # line too long
-  E241, # space after comma (ignored for list in gen-s-parser.py)
-  W504  # line break after binary operator
+  ; line too long
+  E501,
+  ; space after comma (ignored for list in gen-s-parser.py)
+  E241,
+  ; line break after binary operator
+  W504
 exclude = third_party,./test/emscripten,./test/spec,./test/wasm-install,./test/lit

.github/workflows/ci.yml

@@ -28,7 +28,7 @@ jobs:
         fetch-depth: 0
     - name: install tools
       run: |
-        sudo pip3 install -r requirements-dev.txt
+        pip3 install -r requirements-dev.txt
         sudo apt install lsb-release wget software-properties-common gnupg
         wget https://apt.llvm.org/llvm.sh
         sudo chmod +x llvm.sh

check.py

@@ -32,8 +32,8 @@
 def get_changelog_version():
     with open(os.path.join(shared.options.binaryen_root, 'CHANGELOG.md')) as f:
         lines = f.readlines()
-    lines = [l for l in lines if len(l.split()) == 1]
-    lines = [l for l in lines if l.startswith('v')]
+    lines = [line for line in lines if len(line.split()) == 1]
+    lines = [line for line in lines if line.startswith('v')]
     version = lines[0][1:]
     print("Parsed CHANGELOG.md version: %s" % version)
     return int(version)

requirements-dev.txt

@@ -3,6 +3,6 @@
 
 # Install with `pip3 install -r requirements-dev.txt`
 
-flake8==3.7.8
+flake8==7.1.1
 filecheck==0.0.22
 lit==0.11.0.post1

scripts/fuzz_opt.py

@@ -990,7 +990,7 @@ def run_vms(self, wasm):
                     print('(ignored, so not running other VMs)')
 
                     # the ignoring should have been noted during run_vms()
-                    assert(ignored_vm_runs > ignored_before)
+                    assert ignored_vm_runs > ignored_before
 
                     return vm_results
 

scripts/port_passes_tests_to_lit.py

@@ -67,7 +67,7 @@ def port_test(args, test):
     run_line = (f';; RUN: foreach %s %t wasm-opt {" ".join(opts)} -S -o -'
                 ' | filecheck %s')
 
-    notice = (f';; NOTE: This test was ported using'
+    notice = (';; NOTE: This test was ported using'
               ' port_passes_tests_to_lit.py and could be cleaned up.')
 
     with open(test, 'r') as src_file:

scripts/storage.py

@@ -315,7 +315,7 @@ def __init__(self, returncode, cmd, output=None, stderr=None):
 
 
 def run_process(cmd, check=True, input=None, capture_output=False, decode_output=True, *args, **kw):
-    if input and type(input) == str:
+    if input and type(input) is str:
         input = bytes(input, 'utf-8')
     if capture_output:
         kw['stdout'] = subprocess.PIPE
@@ -358,7 +358,7 @@ def fail_if_not_contained(actual, expected):
 
 
 def fail_if_not_identical_to_file(actual, expected_file):
-    binary = expected_file.endswith(".wasm") or type(actual) == bytes
+    binary = expected_file.endswith(".wasm") or type(actual) is bytes
     with open(expected_file, 'rb' if binary else 'r') as f:
         fail_if_not_identical(actual, f.read(), fromfile=expected_file)
 

scripts/test/shared.py

@@ -170,7 +170,7 @@ def to_end(j):
 # write a split wast from split_wast. the wast may be binary if the original
 # file was binary
 def write_wast(filename, wast, asserts=[]):
-    if type(wast) == bytes:
+    if type(wast) is bytes:
         assert not asserts
         with open(filename, 'wb') as o:
             o.write(wast)
@@ -182,7 +182,7 @@ def write_wast(filename, wast, asserts=[]):
 def run_command(cmd, expected_status=0, stderr=None,
                 expected_err=None, err_contains=False, err_ignore=None):
     if expected_err is not None:
-        assert stderr == subprocess.PIPE or stderr is None,\
+        assert stderr == subprocess.PIPE or stderr is None, \
             "Can't redirect stderr if using expected_err"
         stderr = subprocess.PIPE
     print('executing: ', ' '.join(cmd))

scripts/test/support.py

@@ -88,7 +88,7 @@ def itertests(args):
 
 
 def find_run_lines(test, lines):
-    line_matches = [RUN_LINE_RE.match(l) for l in lines]
+    line_matches = [RUN_LINE_RE.match(line) for line in lines]
     matches = [match.group(1) for match in line_matches if match]
     if not matches:
         warn(f'No RUN lines found in {test}. Ignoring.')