From nobody Thu Nov 24 19:48:55 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NJ7pv6mWtz4j0lR; Thu, 24 Nov 2022 19:48:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NJ7pv6BYbz3wYd; Thu, 24 Nov 2022 19:48:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669319335; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VenDwK74cdhiNzxCx66u6Xtz2rJTxAFXuVl0/+DP07I=; b=uxu88FlXoN5FNyOZIjSUo+BSu8RXUcZ59/Be2hNEQRIr3lLHrbStUQFDh43DgW5oxYx4Mx 6Ac+4geZCrmp9s5BmNFohomQeWOkvNpEOYIy93wSt0VJTH1d/MDmjiH/IHfa0rjug0hQDc PTZKLrmr3Ddz4Xas83Fswl43ktSrq8bPEDe8cDfQHfpWJ9/v4Qq5/2jh0vm9yVH66a6jM0 ZT1rO0ayp3af4vbXxvsdWII/HIzx1lD5XXL8U1tAOp11lkpkRqQtkMmp7WI6/ObBBu3ZA+ 4Sk2v0HRIvWMlnwXQ9u73RxHk4MhsUvkkJ60y/oah0sonBt5xJ2iysjvlZyOWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669319335; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VenDwK74cdhiNzxCx66u6Xtz2rJTxAFXuVl0/+DP07I=; b=NrwGOVvMS2cOUbOSIYoH4Z6UBh57LV28Pq04avR/JNsqdXeJK+7PQiisRLhy1syGbNUuN+ /1P+qmeCEWUEp6gdfJ4juv0dKuFxTp3WUsz9L/Pywq3YMOngz/tRGW/HkeHXEi8qM55lNc co2mMMku9juguMwgRC7EODwstvyxO1B2sKduhTb5OYZPmv9p6lVgIQgTlmIHaoIuCiKwIU 6Vwyt6CCzrJHD1tps3XepBHQJ04yAfcvDG6cocFIq1WSIL14AHU30hXieppymuDjQ7kF8q Pm0HYnmz45z9eOKEgDL4U0JrlCLaWcy0dKMUxzmo/2DBIFVhOMHBHMfGQQ3Ojg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669319335; a=rsa-sha256; cv=none; b=u9L6OiYZvAf1NAsIDFRh9LTpLmTvQ9z86C7XI47r2Tj/Y8vu1NklqoGFI3wJgmD7GqiDYq Jq+6MtjAebYwJNL7/SpAh7Dbh89p74orTlogh/BTXsGE/wpdNILNq2d+ax4f5g7dI/gLGC NTfZiETEsDM8GqHv2QeOfECHTH1oDTKJWnodYQzSX2aDrV9WIJwLRWhmAOyYgTSI8RlWT2 x8Ak0yTegqYN8ZqCNH8ki+QM6wZPgRlDWnRiBSNKIX2dSg2xN4ztVMFdnvhtAYqlj72NqA R4pIULd1VaqOEmV5AjI22ExQSqCT74MlFUb/+uYSMAbDrm5hfZc9hEXAn5VHqw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NJ7pv5Cymz1Chp; Thu, 24 Nov 2022 19:48:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2AOJmtOm008790; Thu, 24 Nov 2022 19:48:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AOJmtdp008789; Thu, 24 Nov 2022 19:48:55 GMT (envelope-from git) Date: Thu, 24 Nov 2022 19:48:55 GMT Message-Id: <202211241948.2AOJmtdp008789@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: e135e158c3de - main - devel/py-flake8-import-order: fix with flake8 6.x List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e135e158c3de0a9b69cb8b312927d0135b2630bf Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=e135e158c3de0a9b69cb8b312927d0135b2630bf commit e135e158c3de0a9b69cb8b312927d0135b2630bf Author: Dmitry Marakasov AuthorDate: 2022-11-24 19:18:37 +0000 Commit: Dmitry Marakasov CommitDate: 2022-11-24 19:48:10 +0000 devel/py-flake8-import-order: fix with flake8 6.x --- devel/py-flake8-import-order/Makefile | 5 +-- devel/py-flake8-import-order/files/patch-flake8-6 | 44 +++++++++++++++++++++++ 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/devel/py-flake8-import-order/Makefile b/devel/py-flake8-import-order/Makefile index f57b37bcec2f..6c4424c9100f 100644 --- a/devel/py-flake8-import-order/Makefile +++ b/devel/py-flake8-import-order/Makefile @@ -1,13 +1,14 @@ PORTNAME= flake8-import-order PORTVERSION= 0.18.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= amdmi3@FreeBSD.org COMMENT= Flake8 and pylama plugin that checks the ordering of import statements -WWW= https://pypi.org/project/flake8-import-order/ +WWW= https://pypi.org/project/flake8-import-order/ \ + https://github.com/PyCQA/flake8-import-order LICENSE= LGPL3 LICENSE_FILE= ${WRKSRC}/COPYING diff --git a/devel/py-flake8-import-order/files/patch-flake8-6 b/devel/py-flake8-import-order/files/patch-flake8-6 new file mode 100644 index 000000000000..c77bc82a1279 --- /dev/null +++ b/devel/py-flake8-import-order/files/patch-flake8-6 @@ -0,0 +1,44 @@ +From 231a632a294bb303d7d50ccc1d7650526493efa7 Mon Sep 17 00:00:00 2001 +From: Mike Bayer +Date: Wed, 23 Nov 2022 17:36:42 -0500 +Subject: [PATCH] repair register opt calls + +flake8 uses only argparse option styles now, use +str instead of "string" for types given. + +Fixes: #189 +--- + flake8_import_order/flake8_linter.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/flake8_import_order/flake8_linter.py b/flake8_import_order/flake8_linter.py +index c6fb1ba..7734592 100644 +--- flake8_import_order/flake8_linter.py ++++ flake8_import_order/flake8_linter.py +@@ -25,7 +25,7 @@ def add_options(cls, parser): + "--application-import-names", + default="", + action="store", +- type="string", ++ type=str, + help="Import names to consider as application-specific", + parse_from_config=True, + comma_separated_list=True, +@@ -35,7 +35,7 @@ def add_options(cls, parser): + "--application-package-names", + default="", + action="store", +- type="string", ++ type=str, + help=("Package names to consider as company-specific " + "(used only by 'appnexus' style)"), + parse_from_config=True, +@@ -46,7 +46,7 @@ def add_options(cls, parser): + "--import-order-style", + default=DEFAULT_IMPORT_ORDER_STYLE, + action="store", +- type="string", ++ type=str, + help=("Style to follow. Available: " + + ", ".join(cls.list_available_styles())), + parse_from_config=True,