From nobody Thu Mar 30 14:07:18 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 4PnQGZ69Bvz41pnx; Thu, 30 Mar 2023 14:07:18 +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 4PnQGZ5j07z3v4Y; Thu, 30 Mar 2023 14:07:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680185238; 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=TUFIqO4l8CxW1+6Z6ScZqG6wA+id4AYF4cI4m/4WVb8=; b=rVkNoqcrZJMTwDVBXFjAlkMn9STCxPwcNR67Ixwp5S7NlABuGjcSIwoTOXKKqPtx166kEr 3X8RJmYnVIlUDPli37C/VhFY7A/yk8ti8YJ+9RzJYk2qDqL/ezrfryI7sVElGg9kZX03jd SMTYgGIrnSw4cQEcLdHNf7kdFVYJdVi6/PNAFO14/5TcMS3ezTRB8iN7/DS2AVO9OSrwRo PSrETWBi58MDbtQSZsVyeknosJa697gcIhf9I0UikdGQeaZ1dyrcUEKYwKkyJYF5Y3byYV EY8YKhSRUf37ZCSYJWaEtSyt5K467vY7YE6XGIiEVOFaLiRbsZ6wM8pV0vTWEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680185238; 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=TUFIqO4l8CxW1+6Z6ScZqG6wA+id4AYF4cI4m/4WVb8=; b=lwaERvaC5r8VX6Ti5O1MbogpbfpoEdqjQbAOANjuX2Rg6BRSIpkCaSTZJoPF94lD1D3yWR Nu5gvtYSiuat+NBtFjrUMxHULYCuKSyJzO4cM9CbPKMSl9uIcAJRdiirV/CK07tp5lj6tT 8uJJsw8dMMFhofiHH0lBV6fdG5A7o4gox8jtDOD2nSqZUwOpY6GNcJNq1yPuW7RsBfat7R curYj4+c+ujmmRnGgN4ufvAA5pLtaaN1l0/gV7vaEBj8hhEhMwpJa/Z4en13EceQiejD9x mVk8k+2sS3s7nPFdBCSmR/cOnOGrr/qr+BH04+r8CbEDGyIGI3Qt8BxHNEkn4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680185238; a=rsa-sha256; cv=none; b=AXbCjGYCXMEbOxXMDDhuuQVrUu0IcrbDixo9CKHdqw561unaOBYOxhl9FFj2lEcAJwOpU5 XBoRtKGL4vQwmylSHCmgUTKRhwMfbai/nzoCc75qobmuWHGbZeCiu04/z9aWDpvA5t8bCs L2bnemqsnMmEp+rcOVFGJWbZpqt99yb96TXM8RL+ifdYesVmMmymGHYmEIzLMZaZd4z03e 2RbKXzkLRFHbESaAE2WgHDnucXPra6cBUJ5Tr5ycxLxmKgs5C9u6DQ0NPbQ8DXYBWz/Bg/ XLUXnAWAL1GIs1AD+gT3G/8uRJK7DSWr9fscZDMHHf3btUo7VF6wLh9dg1lY9w== 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 4PnQGZ4lQKzFpR; Thu, 30 Mar 2023 14:07:18 +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 32UE7IrM030414; Thu, 30 Mar 2023 14:07:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32UE7Itv030413; Thu, 30 Mar 2023 14:07:18 GMT (envelope-from git) Date: Thu, 30 Mar 2023 14:07:18 GMT Message-Id: <202303301407.32UE7Itv030413@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Charlie Li Subject: git: 1c796243aeb2 - main - devel/py-setuptools58: convert to PEP-517 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: vishwin X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1c796243aeb2c68eb82d7beddfddf06739560fc7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by vishwin: URL: https://cgit.FreeBSD.org/ports/commit/?id=1c796243aeb2c68eb82d7beddfddf06739560fc7 commit 1c796243aeb2c68eb82d7beddfddf06739560fc7 Author: Charlie Li AuthorDate: 2023-03-30 14:05:04 +0000 Commit: Charlie Li CommitDate: 2023-03-30 14:05:04 +0000 devel/py-setuptools58: convert to PEP-517 easy_install has long been deprecated and unused, remove. --- devel/py-setuptools58/Makefile | 30 ++++++----------------- devel/py-setuptools58/files/easy-install.pth.dist | 2 -- devel/py-setuptools58/files/pkg-message.in | 8 ------ 3 files changed, 7 insertions(+), 33 deletions(-) diff --git a/devel/py-setuptools58/Makefile b/devel/py-setuptools58/Makefile index d77bf56bbec7..40db9bdef42b 100644 --- a/devel/py-setuptools58/Makefile +++ b/devel/py-setuptools58/Makefile @@ -1,5 +1,6 @@ PORTNAME= setuptools PORTVERSION= 58.5.3 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -16,33 +17,16 @@ WWW= https://pypi.org/project/setuptools/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -USES= cpe python:3.7+ -USE_PYTHON= allflavors autoplist concurrent distutils +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} + +USES= cpe python +USE_PYTHON= allflavors autoplist concurrent pep517 pytest CPE_VENDOR= python -MAKE_ENV+= SETUPTOOLS_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1 NO_ARCH= yes -PYDISTUTILS_SETUP= ${PYSETUP} - -PLIST_FILES= "@sample %%PYTHON_SITELIBDIR%%/easy-install.pth.dist %%PYTHON_SITELIBDIR%%/easy-install.pth" - -.include -.if ${FLAVOR} != ${FLAVORS:[1]} -SUB_FILES+= pkg-message -SUB_LIST+= PYTHON_VER=${PYTHON_VER} -.endif - -# These create dependency loops in redports/poudriere, because setuptools -# is currently an explicit BUILD & RUN dependency in Uses/python.mk. -#TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} # pkg install -y py38-pytest py38-mock py38-pytest-fixture-config py38-pytest-virtualenv py38-paver -post-install: - ${INSTALL_DATA} ${FILESDIR}/easy-install.pth.dist ${STAGEDIR}${PYTHON_SITELIBDIR}/ - -do-test: - cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs - -.include +.include diff --git a/devel/py-setuptools58/files/easy-install.pth.dist b/devel/py-setuptools58/files/easy-install.pth.dist deleted file mode 100644 index e7ab88be464d..000000000000 --- a/devel/py-setuptools58/files/easy-install.pth.dist +++ /dev/null @@ -1,2 +0,0 @@ -import sys; sys.__plen = len(sys.path) -import sys; new=sys.path[sys.__plen:]; del sys.path[sys.__plen:]; p=getattr(sys,'__egginsert',0); sys.path[p:p]=new; sys.__egginsert = p+len(new) diff --git a/devel/py-setuptools58/files/pkg-message.in b/devel/py-setuptools58/files/pkg-message.in deleted file mode 100644 index 2c33be99f2e5..000000000000 --- a/devel/py-setuptools58/files/pkg-message.in +++ /dev/null @@ -1,8 +0,0 @@ -[ -{ type: install - message: <