Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp3958991pxv; Mon, 28 Jun 2021 17:45:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwhXxpDP89RExzgi0T08x/bos2JS9mxJV6Bkt4PGvY0VQwWwYfDXKuijZW8xRH8Va5OrRK7 X-Received: by 2002:a05:6e02:1906:: with SMTP id w6mr20376032ilu.281.1624927502306; Mon, 28 Jun 2021 17:45:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624927502; cv=none; d=google.com; s=arc-20160816; b=LS8ga/BhxXqOKoBh8wQVpVVMJv6A01jgPu7S60V14BFcfL80PbJcYAPwxW/YkiuE2s IlMdUfeJ2LtHnu18uyZA+OFPhj1VQ4BQlQ7k4xGAIumlI4mU9PelzjcHwAic657G0W00 l+EiWVeOHNu2SfWzZhx5UOLuyeL2icrCSqZjjFqydAcQ5tiltaXz7dftXgl0CGxHZfSF 2sDRwhJP4Mb/fwyMidnVCAQeCmk/2Acvk+eS+Zp+Ru+73gFBVIoLWsB5qgBm8UVxPXSE B8+nJrxBUq6GS85CaVwnaNBkLq656kykq0LzYWDykloSBcI7DXkDJ+KJTfd1/uZmZzJ/ lwaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:mime-version:message-id:date :dkim-signature; bh=ErXbW4kB5vis3JG9x6sbxAOmYtyXBZy8W86kw16tbmI=; b=tLDT2jNKfIwjBudZN1GS/DOSiRGSYZmSnO2On2v9nGFe3y7Q22TvH468CyBqGSy6w7 l12GqhBRUixc9q1d4n9qmQWwaOJ4PKxQk3ExmsSg1XWBjTTELUIE1j9CxvGOGy0q0XVG Vjb1NL/9DfmJ/joOdT5h/lzLschiUDR5GPSM1C/H9zfjlwzvFl7zbIjEXt7yPeMCAHkI 8SXvDpBc2Sts8ed3CkwROizcuP2SIhKt15XSeszBcrSeCqz0aEJbzzYZlNU4TOa9S4XA Sz1SgP14wmWX6uS9BkjIT0JobK8mYMV370R0yUK0WBsykOEv4RTk16nIyCh95NQpoHPU lWgw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=WgX7wxhJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id h13si18524059jas.116.2021.06.28.17.44.50; Mon, 28 Jun 2021 17:45:02 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=WgX7wxhJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232241AbhF2Alp (ORCPT + 99 others); Mon, 28 Jun 2021 20:41:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59126 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230086AbhF2Alo (ORCPT ); Mon, 28 Jun 2021 20:41:44 -0400 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9EC4DC061574 for ; Mon, 28 Jun 2021 17:39:17 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id o12-20020a5b050c0000b02904f4a117bd74so18636868ybp.17 for ; Mon, 28 Jun 2021 17:39:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=ErXbW4kB5vis3JG9x6sbxAOmYtyXBZy8W86kw16tbmI=; b=WgX7wxhJwSBDTQCu8F9t7asAkjuBaVwiPI/jD8di+K0yMvaaDWERtQT5L1HmRyKtBc 2BffaNKaGsLLDeFPPIHVosSOuKtkPWmBwjwF7OfvkTgTx/k59VXsrocZMfPVSRl4ZvhU w462kyqNSYAGlkOasKgJwp7IHLG+YgACgys7aQQfElBEkZeIrni7ToVmgVxR/VjlO0NU CJYGHIL3E+yLSG/MiH7BMDjEsERKlzHKaVCLJjzYC741muqyTrxq6++kluHP640hlxAs t/926NdnqaBQ2rfxgYf11+J7q4aneBilbasuxhj70QlqwcAij19PeiFRSwRe+J0HsC+C 6rEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=ErXbW4kB5vis3JG9x6sbxAOmYtyXBZy8W86kw16tbmI=; b=ungBC8Smmhr1pIO2bcMjUgPeb1RmgJiGOVHljHomqGSuZHWvKhkIv9xUZqZ7QGoEpi xtmP4JTTzGnswC4iNhuEHCjCnEsypvnppLY2GPGdCujpFqqiYFTyuRZT/JtUnQiN0x5K mbbUv/8HvOECaPWIM5lzjE7SxVfqcT4TQ+DJUHCDWUDDkMAYMOVHft0oxnXQRY9usm1/ rLlG3B6a6g2EgKB/hQu32h5MrjdjteU6Q7hl3FJ3bxybdkZK0LsOMIYkqFCKFKiX6P8d RHT51zPQ0YniqQdRlyZSeUflz/fzr2Hmdpkk1Fv5u+Evekoe4YwGjdwqZp9XFyvAKhAP JMGA== X-Gm-Message-State: AOAM531px1pJ2OsBptj+JgsCoDeQgtlUsG8roMYo6/MTIKqQJT0sCzfP SEteQ/i9Z+2bT4MmkwGfs8/jZ/ikvtJG7A== X-Received: from dlatypov.svl.corp.google.com ([2620:15c:2cd:202:a805:ee32:b96e:716e]) (user=dlatypov job=sendgmr) by 2002:a25:1455:: with SMTP id 82mr34670239ybu.403.1624927156815; Mon, 28 Jun 2021 17:39:16 -0700 (PDT) Date: Mon, 28 Jun 2021 17:39:08 -0700 Message-Id: <20210629003908.1848782-1-dlatypov@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.32.0.93.g670b81a890-goog Subject: [PATCH v2] kunit: tool: remove unnecessary "annotations" import From: Daniel Latypov To: brendanhiggins@google.com, davidgow@google.com Cc: linux-kernel@vger.kernel.org, kunit-dev@googlegroups.com, linux-kselftest@vger.kernel.org, skhan@linuxfoundation.org, Daniel Latypov Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The import was working around the fact "tuple[T]" was used instead of typing.Tuple[T]. Convert it to use typing.Tuple to be consistent with how the rest of the code is annotated. Signed-off-by: Daniel Latypov Reviewed-by: David Gow Reviewed-by: Brendan Higgins Tested-by: Brendan Higgins --- v1 -> v2: fix typos in commit message. --- tools/testing/kunit/kunit_kernel.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/testing/kunit/kunit_kernel.py b/tools/testing/kunit/kunit_kernel.py index 90bc007f1f93..2c6f916ccbaf 100644 --- a/tools/testing/kunit/kunit_kernel.py +++ b/tools/testing/kunit/kunit_kernel.py @@ -6,15 +6,13 @@ # Author: Felix Guo # Author: Brendan Higgins -from __future__ import annotations import importlib.util import logging import subprocess import os import shutil import signal -from typing import Iterator -from typing import Optional +from typing import Iterator, Optional, Tuple from contextlib import ExitStack @@ -208,7 +206,7 @@ def get_source_tree_ops(arch: str, cross_compile: Optional[str]) -> LinuxSourceT raise ConfigError(arch + ' is not a valid arch') def get_source_tree_ops_from_qemu_config(config_path: str, - cross_compile: Optional[str]) -> tuple[ + cross_compile: Optional[str]) -> Tuple[ str, LinuxSourceTreeOperations]: # The module name/path has very little to do with where the actual file # exists (I learned this through experimentation and could not find it base-commit: 1d71307a6f94df3750f8f884545a769e227172fe -- 2.32.0.93.g670b81a890-goog