From nobody Sun Apr 02 06:25:13 2023 X-Original-To: dev-commits-ports-main@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 4Pq3t15G94z4356P; Sun, 2 Apr 2023 06:25:13 +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 4Pq3t14nGtz40Tv; Sun, 2 Apr 2023 06:25:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680416713; 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=5TxPXA3wFsWOfc9y08b9W9Gehdcia0S9p1J5UGQ/SpU=; b=Yz/Vl7aJw97MaqwVZfIa4pyin0R4g/Ynm+dQedjYBBxnlqE060Ud1WIrzC1LktJd3MNR4W 1ao5eW0bew7eNCqglPSsOMMZEmNtu/0DMd0jSIcXQnUV0j/cAP4hRa/ImDffR6EbrYaFVn JKT1uAhRNpqzPQkvmWZ0nSy+F02/ZbTFzmJUUfH+CuJVtMtDCfD/hEZhNKVhWX3Gel7gj1 5P6VGaR5h18eAvu5d9lv+qI7DV7ZbLuFP+ury/8NHJia4+BE8/jLtrln1ZSdhaZa2ZK4Em hDlWjwh56I96P+xZxXDMWYIWRp7kh7y2Uo24/Aamd4IWWpCCTj6qxK7PQYkBhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680416713; 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=5TxPXA3wFsWOfc9y08b9W9Gehdcia0S9p1J5UGQ/SpU=; b=P7jFe33SYFgh8rqPXhxwntuV8SArzAV61x7Yzksj6K9zRzsqMyUpw+t3l9J7n4WzugWB4l n+f8b6c8E9YsPkV3T4SI/zexDDITQmlf7IH01l9Jwl6N0ai38xGOLN9cgVDI/WR3ToHL8J dFprxjrEtnZKKFVIy1+JkToM+/pKT8/jJUrpXuVwP5k1VXulnyZE/mw4c7xd2ez900Hcgm ljBWS3M3csettOoWiljNyOT908jip4Cet4oF9Bdefh1E5ZLo8njf0ooPVW+65F5nsbwvra SsTmfIo5bZ2Q0pmvsgBAl6Jj7swiYgDbGNluDsAjIk7wzudBkgBz/8hShpiK3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680416713; a=rsa-sha256; cv=none; b=s/bPzZLFi3wge5RD6KxrwIASQfKMTeWyqJSDPCebp6HXA5jNsSPOitfxRQuBNPZihRyRFu evf9aBmTvOZfd8NAhnn/m/XKdqTrxwBjw39UfgPlCiqjp7ot6jrPyoSQq+ZndURREeF8Vu TWJspBxO3+os5KiPb5xUQlvwepKWmaSqDzqqfHoEAyfPmnL9lLltHwDmRF0deEK4KUb0ou UeD6VKWnU/R31B9WAJbV2DWTfi7YwUC+UmeyArN9LyQNTuxaJYpWvXU7Pw232gmPakhyGR H+g/zV+aJJbXuyDk3O3LfEmup8eO9DP2kJU9+vSJ23YgYXeriQAvPXFCnegjgg== 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 4Pq3t13r8Xz16Gl; Sun, 2 Apr 2023 06:25:13 +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 3326PDQF079976; Sun, 2 Apr 2023 06:25:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3326PDLQ079975; Sun, 2 Apr 2023 06:25:13 GMT (envelope-from git) Date: Sun, 2 Apr 2023 06:25:13 GMT Message-Id: <202304020625.3326PDLQ079975@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Hiroki Tagato Subject: git: c881e8210178 - main - misc/py-shell-gpt: don't install test files List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tagattie X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c881e82101784ab6b0ee63de2485eb90fd37570f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=c881e82101784ab6b0ee63de2485eb90fd37570f commit c881e82101784ab6b0ee63de2485eb90fd37570f Author: Hiroki Tagato AuthorDate: 2023-04-02 06:23:12 +0000 Commit: Hiroki Tagato CommitDate: 2023-04-02 06:25:08 +0000 misc/py-shell-gpt: don't install test files py-shell-gpt and py-notus-scanner both try to install test files to a generic location (/usr/local/lib/python3.9/site-packages/tests). py-shell-gtp does not require test files for normal operations, so avoid collision by not installing test files. PR: 270542 Reported by: John Hein --- misc/py-shell-gpt/Makefile | 9 ++++++++- misc/py-shell-gpt/files/patch-shell__gpt.egg-info_SOURCES.txt | 10 ++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/misc/py-shell-gpt/Makefile b/misc/py-shell-gpt/Makefile index 8331ba46c8c4..0032fccf71d5 100644 --- a/misc/py-shell-gpt/Makefile +++ b/misc/py-shell-gpt/Makefile @@ -1,5 +1,6 @@ PORTNAME= shell-gpt DISTVERSION= 0.8.1 +PORTREVISION= 1 CATEGORIES= misc python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -24,8 +25,14 @@ USE_PYTHON= autoplist distutils pytest BINARY_ALIAS= python=${PYTHON_CMD} NO_ARCH= yes +post-extract: + @${RM} ${WRKSRC}/tests/__init__.py + +post-patch: + @${FIND} ${WRKSRC} -type f -name '*.orig' -delete + do-test: - cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} tests/unittests.py + cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m unittest tests/unittests.py cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest tests/integrational_tests.py .include diff --git a/misc/py-shell-gpt/files/patch-shell__gpt.egg-info_SOURCES.txt b/misc/py-shell-gpt/files/patch-shell__gpt.egg-info_SOURCES.txt new file mode 100644 index 000000000000..8afe86591b47 --- /dev/null +++ b/misc/py-shell-gpt/files/patch-shell__gpt.egg-info_SOURCES.txt @@ -0,0 +1,10 @@ +--- shell_gpt.egg-info/SOURCES.txt.orig 2023-04-02 05:52:27 UTC ++++ shell_gpt.egg-info/SOURCES.txt +@@ -15,6 +15,3 @@ shell_gpt.egg-info/dependency_links.txt + shell_gpt.egg-info/entry_points.txt + shell_gpt.egg-info/requires.txt + shell_gpt.egg-info/top_level.txt +-tests/__init__.py +-tests/integrational_tests.py +-tests/unittests.py +\ No newline at end of file