From patchwork Fri Oct 13 14:13:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Feemers X-Patchwork-Id: 1848324 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20230601 header.b=L7DGLa5o; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::237; helo=mail-lj1-x237.google.com; envelope-from=swupdate+bncbaabbh5buwuqmgqemrwrzai@googlegroups.com; receiver=patchwork.ozlabs.org) Received: from mail-lj1-x237.google.com (mail-lj1-x237.google.com [IPv6:2a00:1450:4864:20::237]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S6T5Q28Mvz1yqZ for ; Sat, 14 Oct 2023 01:14:01 +1100 (AEDT) Received: by mail-lj1-x237.google.com with SMTP id 38308e7fff4ca-2c503b47880sf10657541fa.0 for ; Fri, 13 Oct 2023 07:14:00 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1697206433; cv=pass; d=google.com; s=arc-20160816; b=EMgieKOVFcGOQpcW3kYSmVEGX6rXE8qfsu/jeR++1ZKot5Yc5PD+qLJVRT0qy6k5po j5VcnlgFaasJWsIwvjj/NbcopugV0V1AZC2C0fh4+3EivO4MwpbCwm9WftWnm29cHVtI gQHHm5ZAUnpLeDO9LisiiUmor/P+W0oLWcy36aBMG6JcGOM8AlsNBA2yCRT4jcW8oUWl 34Vi4/KTkep3fFfb6TUYIJlM67EUyZwkO3A8kFyU8nycHhIxkUeFpRBPdd9ggI3IiGyz l//mybcP2xgk16Opq0Wad49qtfgJi7nO7B3dg3P4BiWqEY5IR5gRNPRkUscq3RbH/DhF Xgbg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:ui-outboundreport:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from:sender :dkim-signature; bh=i9yX9cwZUbq8oMhnqSp67ORryDTsShOainnvaI7e+Yk=; fh=DQx5irV/he8F9UMgU1YJAqGuTX1khEe8HsuvN7O/PZY=; b=ONYUIPeVgiHvB0hDdkXry3VKJvCNlTTm8L+6gXsLAiX02VuIjY0jXVywrKUXfHjXS8 ofgbF/pBcIqC/oY/kwmoruquI4iHGMQwQXwxFYIa7Q/5fQGjzvIzTbEmKgF+tn8mx/p4 Q2QfeAxzH3op8DMR82AsvN8xUKAPF4tvVPrUALSiEkpD6Bc2BRvjCmOsRbBv3C9wg/Xg J1/kBvy1EbvS/7CyrJc+ojyObHV+5ZVw1FfSCikFpixidq5ZdnLnu6nBi79nUUnZ5xrh q63++Vs5iTliu+bl7qnVrFwPtYy4KVo0oFkVpsZ0JOy+A+LZSosCFtRAQvI+Z69hfIxR Vzfw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@gmx.de header.s=s31663417 header.b=nI8Qjmpt; spf=pass (google.com: domain of jan.feemers@gmx.de designates 212.227.15.15 as permitted sender) smtp.mailfrom=jan.feemers@gmx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gmx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1697206433; x=1697811233; darn=patchwork.ozlabs.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:ui-outboundreport:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:sender:from:to:cc :subject:date:message-id:reply-to; bh=i9yX9cwZUbq8oMhnqSp67ORryDTsShOainnvaI7e+Yk=; b=L7DGLa5oPNDMVXlxUY1d4XKUb/nShtjVzjIOxvF9rNnyS0pAmcTEP2T4oOT8Lu9Kz3 nFHbDkAUo5GXeiSIf1TzqhSmhqb47vrqLROmNb64Em3t06ATC8DLDrmP121rvzHEXeua QXvZqgPtQ2CVmCk/SVDZoxHdNxkMFivaZvy88speTI2nc2irSkBAi+kCb3oxr2xju0/y 9dSwTZKnVlSRNcYJDkL2jMycgRKiXEVqOxDPZU/rLat84nB+r70X2CtnKuFd28OcRbIT 2+n/sX1pPa2ykCxyG0YY4tjM6zFGlpCFRnrJIFbN/lIYUIskX8tL3CyAJzflWoSAu3K1 2JtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697206433; x=1697811233; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender :ui-outboundreport:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:x-beenthere:x-gm-message-state:sender:from :to:cc:subject:date:message-id:reply-to; bh=i9yX9cwZUbq8oMhnqSp67ORryDTsShOainnvaI7e+Yk=; b=fmcgc5xOjCVbTGm6LCnAjuFL1qyvXJf2QIqq22qEMklsQVl3mI4iZZmIAuhmUECHCW u4ecXE1QyDpmqDn+/neIlAr+1HOjo4gaz6ugPlCvtbBmlM1SKWn4yWhD7PtFChv84Vam eM+cPDvr4cmDhopilSXM/y0pvu5mAaKxzMUgdHPm5gcVs0t67BDEpFv4vF8jwhx1FRsH 6KgrHexo3bXY/dpo69yfqfObUqfAFXBkQWdNbxQmpLUDmpuWEAbQkxNlvnPkXuc6cbxD HdLpM/esYXa9xVaMsWrLcjZbym5JBD7xapqEG+94RHjllliTaJKoVfAUqXnyBRLeLkFa TtgA== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOJu0YxAjs0O8IswNyZgxygMhEwAvEPCj9oxTXmvbn0zLx8ZJlAmnxmz aTnFbf/YHahSA+N7yK2mc/w= X-Google-Smtp-Source: AGHT+IHpjDTHWUg07PUC0YE4XlMgpgZoB//qyns04yokesTcAXzvrYDMMljv34vgeSGFkAEzUDNnrA== X-Received: by 2002:a2e:8e87:0:b0:2bc:dd8f:ccd7 with SMTP id z7-20020a2e8e87000000b002bcdd8fccd7mr193248ljk.16.1697206431867; Fri, 13 Oct 2023 07:13:51 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a05:651c:154d:b0:2b9:4989:4f1a with SMTP id y13-20020a05651c154d00b002b949894f1als715010ljp.1.-pod-prod-00-eu; Fri, 13 Oct 2023 07:13:50 -0700 (PDT) X-Received: by 2002:a2e:b94e:0:b0:2bc:fd50:573d with SMTP id 14-20020a2eb94e000000b002bcfd50573dmr144976ljs.23.1697206430094; Fri, 13 Oct 2023 07:13:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697206430; cv=none; d=google.com; s=arc-20160816; b=eikrKhB1+S+jZ7XY+BZDqRDs5rUiLrsbODz5h8LDNJZqtwslTdISBxWTr3pevzT1p8 wT7eK1wCMzE89xLBbz1cwaPjXxTe5wBAzDCOmC7S3EO5XOOY7MDwm/oCb3IhzubRyxoN Gg6GxF6SgcvAKKB1auL7ISUYCfP6dqfPcISZ2+jM++BoxNgPBKwvfV4z3yDcvw9zxOcY gaeLQzAN+X+SSaTsLHADrd0ajpzUOIp384Ugp/q3qQxrG4iHyRGXkzEv9ThsjDTQQuMF 8esMq+x9hKK7AFqJJlQjtrxG3tzqQYtjDkLdayYGlQohD9CpK1ElGZZC+vPlMaoT0EjN EiIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=ui-outboundreport:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=8hPfogjnoTRXtOIm9OKk495j1uN0NUD1iA+T/mcsgvQ=; fh=DQx5irV/he8F9UMgU1YJAqGuTX1khEe8HsuvN7O/PZY=; b=qef0eyhI2QM4EF6hnU6iSMYN9jSB1wbjlc+d1ofutagz+w50WOoIzRciaRTP3IAKb+ nMnxU9R0Yk8atcZ9tl+MWh/sgWkWpHTEOI7EdNRStnSzOIMC/oUr7fpLl48a3KoK7I/2 wZlJIsQqneiJM9boCYksiZVqmRxvP/rCYvDkOrOoQWJHJjlycewVrXSHnmu3vnr56f7l YSw8+V3oXerJ9ad82L/STDLH0OmJtzOY1pUroo7NtTnveT4pFPnLNgQ9bYaktQOgyH+y 9xysFAT9AZXS/JJmviFhAhbkG9Wh+FqTmrXzFSbEoEMMzAMyC8CBZUWCqvVBL/XNCLON rH9Q== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmx.de header.s=s31663417 header.b=nI8Qjmpt; spf=pass (google.com: domain of jan.feemers@gmx.de designates 212.227.15.15 as permitted sender) smtp.mailfrom=jan.feemers@gmx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gmx.de Received: from mout.gmx.net (mout.gmx.net. [212.227.15.15]) by gmr-mx.google.com with ESMTPS id b28-20020a2ebc1c000000b002c29b97d5f2si1022913ljf.1.2023.10.13.07.13.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Oct 2023 07:13:50 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.feemers@gmx.de designates 212.227.15.15 as permitted sender) client-ip=212.227.15.15; X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from z-book.fritz.box ([88.64.194.116]) by mail.gmx.net (mrgmx005 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MBDnI-1qi0KR1PFm-00CjdK; Fri, 13 Oct 2023 16:13:49 +0200 From: Jan Feemers To: swupdate@googlegroups.com Cc: Jan Feemers Subject: [swupdate] [PATCH 2/2] refactor: apply black formatting to python files Date: Fri, 13 Oct 2023 16:13:30 +0200 Message-Id: <20231013141330.45969-2-jan.feemers@gmx.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231013141330.45969-1-jan.feemers@gmx.de> References: <20231013141330.45969-1-jan.feemers@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:qVG0Mxj/7nPUqHQGhJs/4gQAt0ycu5o+l0oARfPAMAXOmofFM5t PAhloQ/DAM4VSeoTcyk0v4wN7FGTRZU58ZIOmPNz25NGEmdsFkEheDniXIQl8qzsxTAf2bN cosbe6IF2h22lNwRUdr5Rljy3c+182q6AnEAbUawUrjwLOKTHwoWmY/DDMfX8bAqyxu9R5m OWxiJ16DBAIZkN4s6PnSg== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:Zl1MvuKylz0=;U5Ci2Y/O+OprZWt5jK9lcIpPlOk wt3JYBRQbgSQz+AiMuUWK3GWbDuY/LwHeZKL5kMb0ySuq1cbhMTmagnhUIBq9bgZ8zQr5jvzp sgAU5X4Fj5By5eW8HpyZLeTXiISSmJbNve0Js+YikHRNxpkw6HZAouqcgEQtEemzeRmmpHbrY c2KW/WLpGZYCyQrfP63X24CyYMhxTaWBhdU3qs/ItmFw29m+6pvcvF6RZrWPnQLwZ9Ezg2avb LJ5oudxen5HoP9RDqVeM+SykLm1BCGcd2UyQppnamr0QdFvT2XJ9n4v2ODOMf798p9Or+Gl0S X9S8b/w/UkCcs2eYfs9uGSP9aC7pz5JzMiHnA19+LBn9iD16shOx98TgVCA0ZkAHkUNhNut0i aMAKmpYeBC9pBTbtlssHHmzE9+dw5lxTQwY8bIEIBepZPVHxwRTReMp0XQF7TTUnhUgiX4zBT gbxa6mSuT9UI/EYJeq5WkJaMaaikBEZBCu72bF98v5UZw3updEG7R6lkJM4sNCuw7a1XIvPsJ Nnx7Ijrd/BS0UKNQ09Z0mMSIF2uaOL0aUjvX1P/ByzvY+1ip5EfojCudEmJnXznXyPIvfRMXa hRiT8gj5SlZbowWXwicB8adJJnADc2x2hFKSoaT6JxsGY6b8lRQeEIZWkK7ViiwllnV5KcR3G 1+I1TDejAV1I8ziGKrNuibOUdZdDulMrvgZyDuX/krhiubHGN2qCpo4kBv09tYpPV0WqChF9J hIQ6ih2yvLQHTo9BQ8q6xtpGg7p0TUWTLQY4gh75S19F5eEblhsV+jk23ji2zHtM2euPfiLus hbM5WxZw7ozpKZrClbMHZWEroyxPFsHesXEqumWbAZA7ZlCJJKuSolK+JeTHcEw+D4Tc6PG+G ZxQJu3x/lxJNcFs/j005oUqLLpAGXZmYHAeULKZn4b7DOKRs3O2nJndcHWnpDtGSxab3Ggh7P 3jfC+20wLz45NAmszWlCm9cdkfY= X-Original-Sender: jan.feemers@gmx.de X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmx.de header.s=s31663417 header.b=nI8Qjmpt; spf=pass (google.com: domain of jan.feemers@gmx.de designates 212.227.15.15 as permitted sender) smtp.mailfrom=jan.feemers@gmx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gmx.de Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , ran the cmd: `black swupdateclient` Signed-off-by: Jan Feemers --- tools/python/swupdateclient/setup.py | 14 ++--- .../swupdateclient/swupdateclient/main.py | 54 ++++++++++++------- 2 files changed, 43 insertions(+), 25 deletions(-) -- 2.25.1 diff --git a/tools/python/swupdateclient/setup.py b/tools/python/swupdateclient/setup.py index be05d0b..60d7dc4 100644 --- a/tools/python/swupdateclient/setup.py +++ b/tools/python/swupdateclient/setup.py @@ -4,14 +4,14 @@ from setuptools import setup, find_packages setup( - name='swupdateclient', - version='0.1', + name="swupdateclient", + version="0.1", packages=find_packages(), - url='https://github.com/sbabic/swupdate/tree/master/tools/python/swupdateclient', - license='GPL-2.0-only', - author='Stefano Babic', - author_email='stefano.babic@swupdate.org', - description='Python Client to update SWUpdate based devices', + url="https://github.com/sbabic/swupdate/tree/master/tools/python/swupdateclient", + license="GPL-2.0-only", + author="Stefano Babic", + author_email="stefano.babic@swupdate.org", + description="Python Client to update SWUpdate based devices", entry_points={ "console_scripts": [ "swupdateclient=swupdateclient.main:main", diff --git a/tools/python/swupdateclient/swupdateclient/main.py b/tools/python/swupdateclient/swupdateclient/main.py index 28334a4..b6472e9 100644 --- a/tools/python/swupdateclient/swupdateclient/main.py +++ b/tools/python/swupdateclient/swupdateclient/main.py @@ -46,10 +46,12 @@ class ColorFormatter(logging.Formatter): } def format(self, record): - return logging.Formatter(colored( - "%(levelname)s:%(name)s:%(message)s", - self.COLORS[record.levelno], - attrs=self.ATTRIBUTES[record.levelno]) + return logging.Formatter( + colored( + "%(levelname)s:%(name)s:%(message)s", + self.COLORS[record.levelno], + attrs=self.ATTRIBUTES[record.levelno], + ) ).format(record) @@ -59,7 +61,15 @@ class SWUpdater: url_upload = "http://{}:{}{}/upload" url_status = "ws://{}:{}{}/ws" - def __init__(self, path_image, host_name, port=8080, route="", logger=None, log_level=logging.DEBUG): + def __init__( + self, + path_image, + host_name, + port=8080, + route="", + logger=None, + log_level=logging.DEBUG, + ): self._image = path_image self._host_name = host_name self._port = port @@ -99,9 +109,7 @@ class SWUpdater: if data["type"] != "message": continue - self._logger.log( - LOGGING_MAPPING[data["level"]], - data["text"]) + self._logger.log(LOGGING_MAPPING[data["level"]], data["text"]) if "SWUPDATE successful" in data["text"]: return True @@ -130,8 +138,8 @@ class SWUpdater: if response.status_code != 200: self._logger.error( - "Cannot upload software image: %s", - response.status_code) + "Cannot upload software image: %s", response.status_code + ) return False self._logger.info( @@ -168,7 +176,7 @@ class SWUpdater: return asyncio.run(self.start_tasks(timeout)) -def client (args: List[str]) -> None: +def client(args: List[str]) -> None: parser = argparse.ArgumentParser() parser.add_argument("swu_file", help="Path to swu image") parser.add_argument("host_name", help="Host name") @@ -178,7 +186,7 @@ def client (args: List[str]) -> None: help="Name of the API route (e.g. /ROUTE)", type=str, default="", - nargs="?" + nargs="?", ) parser.add_argument( "--timeout", @@ -188,13 +196,20 @@ def client (args: List[str]) -> None: nargs="?", ) parser.add_argument( - "--log-level", help="change log level (error, info, warning, debug)", - type=str, metavar="[LEVEL]", - choices=["error", "info", "warning", "debug"], default="debug" + "--log-level", + help="change log level (error, info, warning, debug)", + type=str, + metavar="[LEVEL]", + choices=["error", "info", "warning", "debug"], + default="debug", ) parser.add_argument( - "--color", help="colorize messages (auto, always or never)", type=str, - metavar="[WHEN]", choices=["auto", "always", "never"], default="auto" + "--color", + help="colorize messages (auto, always or never)", + type=str, + metavar="[WHEN]", + choices=["auto", "always", "never"], + default="auto", ) args = parser.parse_args() @@ -210,11 +225,14 @@ def client (args: List[str]) -> None: args.host_name, args.port, args.route, - log_level=args.log_level.upper()) + log_level=args.log_level.upper(), + ) updater.update(timeout=args.timeout) + def main(): client(sys.argv[1:]) + if __name__ == "__main__": main()