From nobody Mon Mar 27 13:23:12 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 4PlYR514wqz41Ws5; Mon, 27 Mar 2023 13:23: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 4PlYR50Yy5z3sJZ; Mon, 27 Mar 2023 13:23:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679923393; 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=wlD8Du5biRlJlA3JujRqU01liX6Nz/tkJyTpWBYpGwc=; b=U7aVD2yYOWDiQ3SxQDS1M7blXzGgXNaXuV6aSQe/MxBCIoFB5nYx4SoiYLUWLc04YgeGlZ kGZCPsXmnV3opyhDZ5tF6e3ARVxrQr/TOXAC7pBF8X+/31A7OuQIaQ0IzK8ARnSLfPU5o+ 1wpdMmRYGAuO/ukkUvbJXVlR+pXdaGL5TlSv7rW+2g+yWV2E5p8fxOH4UgadQFolCnMeMM VklHFsnVKk8sJa2CE2ZYPEm5vfsuBABPLUaHWKIvMxeBc9KBWV3cbmT0O92HDrW4kgNdd1 F3L2X4Fh+D97rM1gM9Ln8FsuxDDARsf1whtZtP52K8z9iPdccXQ697PolDTNSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679923393; 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=wlD8Du5biRlJlA3JujRqU01liX6Nz/tkJyTpWBYpGwc=; b=EiPF0rSkyq1GoJF4l5dg6WzEW+vMS1azSI8wtr6cAaYQqodamMxueSATdIfiFCuH1YfcIy ijsRpuDwSlovm3n20Il07p484wXHsx+XjmsbtiA6Q2CzPn3eitSYEac4qUFYK93epdFdbn DJJbaTNv2+pj6J67Agrgkexj3Jo2uYhZwkNYdA6eYlEN5DOLTSpFNmQXY8gE/VVE+Mc0Am iDN4upTtodRiIycPBi6pi+imU2Jcj0XIL9CM06M5d1RGYzaqnM2PyiMP7Vx0qlQ3QOcp6G bQXkWvfZM16rFGnwsllxdjtRA0GJdYR81nXzna82n1Dg0j3ONuVeENoCgGu0Ig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679923393; a=rsa-sha256; cv=none; b=RKSxdGQ68FCX2XZ6PWv0UmA4p9JUFzHCZ5wh5RO5ev0nymogpExCLCHC+7I5v8NRYtSFRG cPSAGpkppQBbbcJumHviyFKj3v/kAt2RmF2pv5Md/AUpNGJkuLqufgiEoqafd2sqq+RLf6 KdSnaa59TgUqaewI0PbLSaTAdM3ZzzU6sqLBumow7DCDcgtdpoJjyPORUTKW7JNHz2X18S U+pvye7wH3VjXzE43lFRgxBbPKOdGwCR1ROktVlollAp90pzpDN1M6h4UiPMuR+bw65OQe 8XxgJ0+TVA2kMGvTI7cx2zDphb85y2pOwiVNfI+N3M0sDER3rIsjqE2lqtYktw== 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 4PlYR46ncmzPHy; Mon, 27 Mar 2023 13:23:12 +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 32RDNCT1057916; Mon, 27 Mar 2023 13:23:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32RDNCX6057915; Mon, 27 Mar 2023 13:23:12 GMT (envelope-from git) Date: Mon, 27 Mar 2023 13:23:12 GMT Message-Id: <202303271323.32RDNCX6057915@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthew Seaman Subject: git: 14eebf548833 - main - textproc/py-wcmatch: Switch to USE_PYTHON= pep517 pytest 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: matthew X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 14eebf54883322bc854e15272036c45b519da694 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by matthew: URL: https://cgit.FreeBSD.org/ports/commit/?id=14eebf54883322bc854e15272036c45b519da694 commit 14eebf54883322bc854e15272036c45b519da694 Author: Matthew Seaman AuthorDate: 2023-03-27 13:19:36 +0000 Commit: Matthew Seaman CommitDate: 2023-03-27 13:23:03 +0000 textproc/py-wcmatch: Switch to USE_PYTHON= pep517 pytest Use the system provided mechanisms for pep517 and pytest rather than rolling our own. Ignore widows specific tests. Only changes to the build system with no functional effect on the built package, so no version bump. --- textproc/py-wcmatch/Makefile | 30 ++++++++++-------------------- textproc/py-wcmatch/pkg-plist | 28 ---------------------------- 2 files changed, 10 insertions(+), 48 deletions(-) diff --git a/textproc/py-wcmatch/Makefile b/textproc/py-wcmatch/Makefile index ffbd228a78b7..a402234221a5 100644 --- a/textproc/py-wcmatch/Makefile +++ b/textproc/py-wcmatch/Makefile @@ -15,31 +15,21 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hatchling>=0.21.1:devel/py-hatchling@${PY_ ${PYTHON_PKGNAMEPREFIX}pip>=22.2:devel/py-pip@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bracex>=2.1.1:textproc/py-bracex@${PY_FLAVOR} -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \ +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${PY_FLAVOR} USES= python:3.7+ -USE_PYTHON= flavors +USE_PYTHON= flavors pep517 pytest - -# PYTHON_EXT_SUFFIX could be used here, except that it is -# special-cased for python3.7 which we don't want. -PYCACHE_SUFFIX= .cpython-${PYTHON_SUFFIX}.pyc - -PLIST_SUB+= PORTVERSION=${PORTVERSION} PYCACHE_SUFFIX=${PYCACHE_SUFFIX} +# Windows specific tests +PYTEST_IGNORED_TESTS= test_escape_windows \ + test_norm_windows \ + test_escape_windows \ + test_drive_insensitive \ + test_drive_sensitive \ + test_root_win \ + test_glob_match_real_ignore_forceunix NO_ARCH= yes -do-build: - cd ${WRKSRC} && ${PYTHON_CMD} -m hatchling build -t wheel - -do-install: - ${PYTHON_CMD} -m pip --no-cache-dir install --no-deps --ignore-installed \ - --disable-pip-version-check --target ${STAGEDIR}${PYTHON_SITELIBDIR} \ - ${WRKSRC}/dist/${PORTNAME}-${PORTVERSION}-py3-none-any.whl - -do-test: - @(cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest) - .include diff --git a/textproc/py-wcmatch/pkg-plist b/textproc/py-wcmatch/pkg-plist deleted file mode 100644 index 751f7c1af749..000000000000 --- a/textproc/py-wcmatch/pkg-plist +++ /dev/null @@ -1,28 +0,0 @@ -%%PYTHON_LIBDIR%%/site-packages/wcmatch-%%PORTVERSION%%.dist-info/WHEEL -%%PYTHON_LIBDIR%%/site-packages/wcmatch-%%PORTVERSION%%.dist-info/REQUESTED -%%PYTHON_LIBDIR%%/site-packages/wcmatch-%%PORTVERSION%%.dist-info/RECORD -%%PYTHON_LIBDIR%%/site-packages/wcmatch-%%PORTVERSION%%.dist-info/INSTALLER -%%PYTHON_LIBDIR%%/site-packages/wcmatch-%%PORTVERSION%%.dist-info/direct_url.json -%%PYTHON_LIBDIR%%/site-packages/wcmatch-%%PORTVERSION%%.dist-info/METADATA -%%PYTHON_LIBDIR%%/site-packages/wcmatch-%%PORTVERSION%%.dist-info/licenses/LICENSE.md -%%PYTHON_LIBDIR%%/site-packages/wcmatch/fnmatch.py -%%PYTHON_LIBDIR%%/site-packages/wcmatch/_wcparse.py -%%PYTHON_LIBDIR%%/site-packages/wcmatch/posix.py -%%PYTHON_LIBDIR%%/site-packages/wcmatch/__pycache__/_wcparse%%PYCACHE_SUFFIX%% -%%PYTHON_LIBDIR%%/site-packages/wcmatch/__pycache__/glob%%PYCACHE_SUFFIX%% -%%PYTHON_LIBDIR%%/site-packages/wcmatch/__pycache__/fnmatch%%PYCACHE_SUFFIX%% -%%PYTHON_LIBDIR%%/site-packages/wcmatch/__pycache__/_wcmatch%%PYCACHE_SUFFIX%% -%%PYTHON_LIBDIR%%/site-packages/wcmatch/__pycache__/wcmatch%%PYCACHE_SUFFIX%% -%%PYTHON_LIBDIR%%/site-packages/wcmatch/__pycache__/pathlib%%PYCACHE_SUFFIX%% -%%PYTHON_LIBDIR%%/site-packages/wcmatch/__pycache__/__init__%%PYCACHE_SUFFIX%% -%%PYTHON_LIBDIR%%/site-packages/wcmatch/__pycache__/__meta__%%PYCACHE_SUFFIX%% -%%PYTHON_LIBDIR%%/site-packages/wcmatch/__pycache__/posix%%PYCACHE_SUFFIX%% -%%PYTHON_LIBDIR%%/site-packages/wcmatch/__pycache__/util%%PYCACHE_SUFFIX%% -%%PYTHON_LIBDIR%%/site-packages/wcmatch/glob.py -%%PYTHON_LIBDIR%%/site-packages/wcmatch/__init__.py -%%PYTHON_LIBDIR%%/site-packages/wcmatch/__meta__.py -%%PYTHON_LIBDIR%%/site-packages/wcmatch/util.py -%%PYTHON_LIBDIR%%/site-packages/wcmatch/_wcmatch.py -%%PYTHON_LIBDIR%%/site-packages/wcmatch/py.typed -%%PYTHON_LIBDIR%%/site-packages/wcmatch/pathlib.py -%%PYTHON_LIBDIR%%/site-packages/wcmatch/wcmatch.py