From nobody Sun Apr 9 13:40:35 2023 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 4PvYC82G4dz44SFl; Sun, 9 Apr 2023 13:40:36 +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 4PvYC81C0Nz4L6Y; Sun, 9 Apr 2023 13:40:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681047636; 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=WZCcOb+TpAeiTThcRiS5aEowBMZMk9T1U6gUFgXQLrY=; b=DvUwqHks4QDBFgaZChT3PCuXmw5ljBYtExGrySuIQaKucuyBdMUwwN1fTGIvbDZ3JUwMIV gobcU1Mm/SPxNOjQtcztgM2g2P0YSyuOOHO1Yy2UT7qY620NKBLjjXhvlRJKKyztVSCWvD VLsGnj4MStuke/Mg2lNHYAIE5Jpgj219JGMUFPvAXB8tmnLQtmUY39FN/DXYggUHrOJZcZ HK6ZkCXNlNvVvmEkuOOr22HSaMkup00J21uH/K2Ek35wbrkLXlkqzOBvKZxFfKthHr1xE/ RdJONVR15pi7QHMOYhyyaqPOC8L8USV8281sMCcgGKHhdBJxewLx/IOiXB7XUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681047636; 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=WZCcOb+TpAeiTThcRiS5aEowBMZMk9T1U6gUFgXQLrY=; b=sNlPy83M3K9zAh7jMgckrt1P1MI054Q4edXMKekungewjGA9kkcCQA77OkfL8ayORzeVUT x/N1wHT376yAHT/T2iUgQFj0vjxtui3KnRaW9My12zN3fADVrFOoHLb6Q7UptZhZDgFYIQ 5SgohTa82tqhsNITIUixJuzjs+5TJW/ovqM4NPlv1WQ8xfFOz35q2mPM6w2L4oBQRwfblk dMp3fQQB09VZhnOSkHAiqwvw5FpEpEyTpC7UDi0fxEDFBy0bz3toGmFWaLvY1j70dAAA2i sjrukLzxDWOzkHgeqE0mJ2F47Mg5mpfjdkOeTNrLVXpR0R6BEDJmf/aFJV1aPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681047636; a=rsa-sha256; cv=none; b=tAJAfAenP/YTNTwJLV7r8yllqU6TMvleP6SMcpq05ioHFS5RPmf2JXmo73dr43oVb5GK/d n6MAB0BpPwzf8Hnq2EBRfMGH/nG8uzo6M0RQCm41lKub2uq6A4/muitEsfUF5eCr6LEvLj qzTi1BEY/2oh2lyh6DGmP9k9mBASyYuclM9kPwzc0NfOv5N2FWvG1GWctFtyBj3upYHFL/ vguJipQP8P9GK25GxHRZhQUvA01umQ8HbG8CiXc/4pUZKlyRy1kwwMqplBvnOc7yKcXwnU lnM5ZevW0Twlk0XzGZ6sbhj8TYCmzSMBl9s6wXwrRtu4Yms36RUvKE2s0i8uwA== 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 4PvYC72v78z18rD; Sun, 9 Apr 2023 13:40:35 +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 339DeZHY090473; Sun, 9 Apr 2023 13:40:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 339DeZ2B090472; Sun, 9 Apr 2023 13:40:35 GMT (envelope-from git) Date: Sun, 9 Apr 2023 13:40:35 GMT Message-Id: <202304091340.339DeZ2B090472@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 69512db5c3b8 - main - devel/py-argcomplete: Convert to USE_PYTHON=unittest 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 69512db5c3b8a4dbeca228a0c5012e35b86a5391 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=69512db5c3b8a4dbeca228a0c5012e35b86a5391 commit 69512db5c3b8a4dbeca228a0c5012e35b86a5391 Author: Po-Chuan Hsieh AuthorDate: 2023-04-09 13:30:57 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-04-09 13:36:44 +0000 devel/py-argcomplete: Convert to USE_PYTHON=unittest --- devel/py-argcomplete/Makefile | 17 +++++++------- devel/py-argcomplete/files/patch-test-test.py | 34 +++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 8 deletions(-) diff --git a/devel/py-argcomplete/Makefile b/devel/py-argcomplete/Makefile index 5543c553a98c..acaae153f168 100644 --- a/devel/py-argcomplete/Makefile +++ b/devel/py-argcomplete/Makefile @@ -11,21 +11,22 @@ WWW= https://github.com/kislyuk/argcomplete LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.rst -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${PY_FLAVOR} \ +TEST_DEPENDS= bash:shells/bash \ + ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py-flake8@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mypy>=0:devel/py-mypy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pexpect>=0:misc/py-pexpect@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} -USES= python:3.6+ -USE_PYTHON= autoplist concurrent distutils +USES= python:3.8+ shebangfix +USE_PYTHON= autoplist concurrent distutils unittest NO_ARCH= yes -.include +SHEBANG_FILES= scripts/* \ + test/prog -.if ${PYTHON_REL} < 30800 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=0.23<6:devel/py-importlib-metadata@${PY_FLAVOR} -.endif +post-patch: + @${REINPLACE_CMD} -e 's|%%PYTHON_CMD%%|${PYTHON_CMD}|' ${WRKSRC}/test/test.py -.include +.include diff --git a/devel/py-argcomplete/files/patch-test-test.py b/devel/py-argcomplete/files/patch-test-test.py new file mode 100644 index 000000000000..b6644ccd8dc0 --- /dev/null +++ b/devel/py-argcomplete/files/patch-test-test.py @@ -0,0 +1,34 @@ +--- test/test.py.orig 2023-03-17 17:34:51 UTC ++++ test/test.py +@@ -1247,11 +1247,11 @@ class TestBashGlobal(TestBash): + + def test_python_completion(self): + self.sh.run_command("cd " + TEST_DIR) +- self.assertEqual(self.sh.run_command("python3 ./prog basic f\t"), "foo\r\n") ++ self.assertEqual(self.sh.run_command("%%PYTHON_CMD%% ./prog basic f\t"), "foo\r\n") + + def test_python_filename_completion(self): + self.sh.run_command("cd " + TEST_DIR) +- self.assertEqual(self.sh.run_command("python3 ./pro\tbasic f\t"), "foo\r\n") ++ self.assertEqual(self.sh.run_command("%%PYTHON_CMD%% ./pro\tbasic f\t"), "foo\r\n") + + def test_python_not_executable(self): + """Test completing a script that cannot be run directly.""" +@@ -1263,7 +1263,7 @@ class TestBashGlobal(TestBash): + # Ensure prog is no longer able to be run as "./prog". + self.assertIn("<<126>>", self.sh.run_command('./prog; echo "<<$?>>"')) + # Ensure completion still functions when run via python. +- self.assertEqual(self.sh.run_command("python3 ./prog basic f\t"), "foo\r\n") ++ self.assertEqual(self.sh.run_command("%%PYTHON_CMD%% ./prog basic f\t"), "foo\r\n") + + def test_python_module(self): + """Test completing a module run with python -m.""" +@@ -1273,7 +1273,7 @@ class TestBashGlobal(TestBash): + open("package/__init__.py", "w").close() + shutil.copy(prog, "package/prog.py") + self.sh.run_command("cd " + os.getcwd()) +- self.assertEqual(self.sh.run_command("python3 -m package.prog basic f\t"), "foo\r\n") ++ self.assertEqual(self.sh.run_command("%%PYTHON_CMD%% -m package.prog basic f\t"), "foo\r\n") + + def _test_console_script(self, package=False, wheel=False): + with TempDir(prefix="test_dir_py", dir="."):