From nobody Tue Apr 26 13:49:10 2022 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 14CEE1AB25EF; Tue, 26 Apr 2022 13:49:12 +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 4Knjsg3hThz3CHc; Tue, 26 Apr 2022 13:49:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650980951; 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=reu5LCKkNgbMjFvBsGSDG+0yMI6Q1vLhIDCdw1PLrSI=; b=Evpo4tCj75Kdfm+1/TQW2LibS80DEEK93ttqVrYGrJ10SxyE/Yor2TahpHs8iuAfOb45Fr d4idnqy6r9KEX5F7rjIJVdGjB47ITP+R4a8x5Ywrz5h9OMXsAkIn8o+AMczvmzQgrmW0l2 5EjRbdqNpmnBAgpcADWy2P9Ag2qQAEW1hr+lbDSysFsIZ8EohqhAJYM5c68MGuAiUcaz1n Y78XoBSFOG7epE3Av/KpzuyqU7ip1SOSi1U9LzgJ7EDWqN6G/GS7MWGwqJm6ZuKcjEdcUk km9tBEi6c41xACixVD2dgeH9UByWr82mMLFgaF1Rz8ta3DBHGCGQ2iJLLIribw== 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 AFCAE10608; Tue, 26 Apr 2022 13:49:10 +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 23QDnA6S027429; Tue, 26 Apr 2022 13:49:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23QDnAq7027428; Tue, 26 Apr 2022 13:49:10 GMT (envelope-from git) Date: Tue, 26 Apr 2022 13:49:10 GMT Message-Id: <202204261349.23QDnAq7027428@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: 75bf72ea4b21 - main - textproc/py-pyscss: switch to USES=pytest and fix tests 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: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 75bf72ea4b2103b7009e65305bb4979023442e11 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650980951; 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=reu5LCKkNgbMjFvBsGSDG+0yMI6Q1vLhIDCdw1PLrSI=; b=wW6zVdhGgz8TFynvPKT95wAiNzSDLVoV7Tih3JJLYzTfc+Rljnak97Yn4ZEthRixFGFTVG oSWPZcAxgwn4A43EZeMz7YJga/6dIW8QLXEgAWdmdmQzvgbiTdD+AH/6Dn8eXRMyvZXNbI orj+r4uaQZJFD8ItNB3E1UGR4jmqs/erRJqWPy+7CMnTggEihNfg6D10Llkm3+UVp3hxk6 kTws7gVqfXiZ2a7/sKwk+Sv2XSA/aiOhDtQeyqemFjVLMnBlgPBuat2cg+mmuyLLtxg7/E Wz3jIIfX8eLJlTWfZejXxVg4U9MKs32+/Dibn5c5An2p4Ov6mtOI/zs1LRqkow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650980951; a=rsa-sha256; cv=none; b=IGolL7b1fhDu/Hw5hMwHNIQuh/OsQ6puDJL4UOOTbFnKnVrbBBm/NWJ76EufYIO5eqHwba N02ZiKvb9WVILVPjfdwZkZvf2UlO7l953dPFFzMMjkhbHvsufucHUXHSWBdAd8jx7K3+aG rpHSzoGir6Mq2qyu9ftgY3Q6ZMwrvpqSW80SnCtCnuJnfpl3jeb8mSbk45jOU93ZYxK7+6 v2xsjfU9AnoLvP9uTdvCE9dIJlfCyls2z0McJH4ivQ4MTjnsX0R5YH45q28TReVA9TZa60 P6lTdCRFTgSCrvNqzNdtzNmD6fvr4CrcmgOiG0VF18KPoSMwAVJRAnYxo1vsEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=75bf72ea4b2103b7009e65305bb4979023442e11 commit 75bf72ea4b2103b7009e65305bb4979023442e11 Author: Dmitry Marakasov AuthorDate: 2022-04-26 12:30:03 +0000 Commit: Dmitry Marakasov CommitDate: 2022-04-26 13:44:32 +0000 textproc/py-pyscss: switch to USES=pytest and fix tests Reported by: reprise Approved by: portmgr blanket --- textproc/py-pyscss/Makefile | 6 +----- .../py-pyscss/files/patch-scss_tests_test__cli.py | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/textproc/py-pyscss/Makefile b/textproc/py-pyscss/Makefile index 1264d297fc9b..42b55036fc90 100644 --- a/textproc/py-pyscss/Makefile +++ b/textproc/py-pyscss/Makefile @@ -13,16 +13,12 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} LIB_DEPENDS= libpcre.so:devel/pcre -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} USE_GITHUB= yes GH_ACCOUNT= Kronuz GH_PROJECT= pyScss -USES= python:3.6+ localbase:ldflags +USES= python:3.6+ localbase:ldflags pytest:4 USE_PYTHON= distutils autoplist -do-test: - @(cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest) - .include diff --git a/textproc/py-pyscss/files/patch-scss_tests_test__cli.py b/textproc/py-pyscss/files/patch-scss_tests_test__cli.py new file mode 100644 index 000000000000..562d448de1da --- /dev/null +++ b/textproc/py-pyscss/files/patch-scss_tests_test__cli.py @@ -0,0 +1,19 @@ +https://github.com/Kronuz/pyScss/pull/425 + +--- scss/tests/test_cli.py.orig 2020-03-26 15:04:27 UTC ++++ scss/tests/test_cli.py +@@ -1,4 +1,5 @@ + """Test the command-line tool from the outside.""" ++import sys + from subprocess import PIPE, Popen + + # TODO: this needs way, way, way, way more tests +@@ -6,7 +7,7 @@ from subprocess import PIPE, Popen + + def test_stdio(): + proc = Popen( +- ['python', '-m', 'scss.tool', '-C'], ++ [sys.executable, '-m', 'scss.tool', '-C'], + stdin=PIPE, + stdout=PIPE, + # this automatically handles encoding/decoding on py3