qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: John Snow <jsnow@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
	Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>,
	Eduardo Habkost <ehabkost@redhat.com>,
	qemu-block@nongnu.org, Markus Armbruster <armbru@redhat.com>,
	Max Reitz <mreitz@redhat.com>, Cleber Rosa <crosa@redhat.com>,
	John Snow <jsnow@redhat.com>
Subject: [PATCH v2 17/17] iotests/linters: check mypy files all at once
Date: Tue, 20 Jul 2021 13:33:36 -0400	[thread overview]
Message-ID: <20210720173336.1876937-18-jsnow@redhat.com> (raw)
In-Reply-To: <20210720173336.1876937-1-jsnow@redhat.com>

We can circumvent the '__main__' redefinition problem by passing
--scripts-are-modules. Take mypy out of the loop per-filename and check
everything in one go: it's quite a bit faster.

Signed-off-by: John Snow <jsnow@redhat.com>
---
 tests/qemu-iotests/linters.py | 56 ++++++++++++++++-------------------
 1 file changed, 26 insertions(+), 30 deletions(-)

diff --git a/tests/qemu-iotests/linters.py b/tests/qemu-iotests/linters.py
index 242cb9c3e69..b95425e81aa 100755
--- a/tests/qemu-iotests/linters.py
+++ b/tests/qemu-iotests/linters.py
@@ -86,37 +86,33 @@ def run_linters(
     print('=== mypy ===')
     sys.stdout.flush()
 
-    # We have to call mypy separately for each file.  Otherwise, it
-    # will interpret all given files as belonging together (i.e., they
-    # may not both define the same classes, etc.; most notably, they
-    # must not both define the __main__ module).
-    for filename in files:
-        p = subprocess.run(
-            (
-                'python3', '-m', 'mypy',
-                '--warn-unused-configs',
-                '--disallow-subclassing-any',
-                '--disallow-any-generics',
-                '--disallow-incomplete-defs',
-                '--disallow-untyped-decorators',
-                '--no-implicit-optional',
-                '--warn-redundant-casts',
-                '--warn-unused-ignores',
-                '--no-implicit-reexport',
-                '--namespace-packages',
-                filename,
-            ),
-            cwd=directory,
-            env=env,
-            check=False,
-            stdout=subprocess.PIPE,
-            stderr=subprocess.STDOUT,
-            universal_newlines=True
-        )
+    p = subprocess.run(
+        (
+            'python3', '-m', 'mypy',
+            '--warn-unused-configs',
+            '--disallow-subclassing-any',
+            '--disallow-any-generics',
+            '--disallow-incomplete-defs',
+            '--disallow-untyped-decorators',
+            '--no-implicit-optional',
+            '--warn-redundant-casts',
+            '--warn-unused-ignores',
+            '--no-implicit-reexport',
+            '--namespace-packages',
+            '--scripts-are-modules',
+            *files,
+        ),
+        cwd=directory,
+        env=env,
+        check=False,
+        stdout=subprocess.PIPE,
+        stderr=subprocess.STDOUT,
+        universal_newlines=True
+    )
 
-        ret += p.returncode
-        if p.returncode != 0:
-            print(p.stdout)
+    ret += p.returncode
+    if p.returncode != 0:
+        print(p.stdout)
 
     return ret
 
-- 
2.31.1



  parent reply	other threads:[~2021-07-20 17:47 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-20 17:33 [PATCH v2 00/17] python/iotests: Run iotest linters during Python CI John Snow
2021-07-20 17:33 ` [PATCH v2 01/17] iotests: use with-statement for open() calls John Snow
2021-07-20 17:55   ` Philippe Mathieu-Daudé
2021-07-20 17:33 ` [PATCH v2 02/17] iotests: use subprocess.DEVNULL instead of open("/dev/null") John Snow
2021-07-20 17:57   ` Philippe Mathieu-Daudé
2021-07-20 17:33 ` [PATCH v2 03/17] iotests/mirror-top-perms: Adjust import paths John Snow
2021-07-20 17:57   ` Philippe Mathieu-Daudé
2021-07-20 17:33 ` [PATCH v2 04/17] iotests/migrate-bitmaps-postcopy-test: declare instance variables John Snow
2021-07-20 17:33 ` [PATCH v2 05/17] iotests/migrate-bitmaps-test: delint John Snow
2021-07-20 17:33 ` [PATCH v2 06/17] iotests/297: modify is_python_file to work from any CWD John Snow
2021-07-20 17:33 ` [PATCH v2 07/17] iotests/297: Add get_files() function John Snow
2021-07-20 17:33 ` [PATCH v2 08/17] iotests/297: Include sub-directories when finding tests to lint John Snow
2021-07-20 17:33 ` [PATCH v2 09/17] iotests/297: Don't rely on distro-specific linter binaries John Snow
2021-07-20 17:59   ` Philippe Mathieu-Daudé
2021-07-20 17:33 ` [PATCH v2 10/17] iotests/297: Create main() function John Snow
2021-07-20 17:33 ` [PATCH v2 11/17] iotests/297: Separate environment setup from test execution John Snow
2021-07-20 17:33 ` [PATCH v2 12/17] iotests/297: Add 'directory' argument to run_linters John Snow
2021-07-20 17:33 ` [PATCH v2 13/17] iotests/297: return error code from run_linters() John Snow
2021-07-20 17:33 ` [PATCH v2 14/17] iotests/297: split linters.py off from 297 John Snow
2021-07-20 17:33 ` [PATCH v2 15/17] iotests/linters: Add entry point for Python CI linters John Snow
2021-07-20 17:33 ` [PATCH v2 16/17] python: Add iotest linters to test suite John Snow
2021-07-20 17:33 ` John Snow [this message]
2021-07-20 19:17 ` [PATCH v2 00/17] python/iotests: Run iotest linters during Python CI John Snow
2021-08-24 15:13 ` Hanna Reitz

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210720173336.1876937-18-jsnow@redhat.com \
    --to=jsnow@redhat.com \
    --cc=armbru@redhat.com \
    --cc=crosa@redhat.com \
    --cc=ehabkost@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=mreitz@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=vsementsov@virtuozzo.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).