From nobody Sun Jan 15 19:57:00 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 4Nw5XD5gxHz2sV3Z; Sun, 15 Jan 2023 19:57:00 +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 4Nw5XD58DZz3qSn; Sun, 15 Jan 2023 19:57:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673812620; 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=M5h+8JHi/IkRqg2gWCwoYBNTSY9EFOxV5f2FJRpfiuQ=; b=kd4aUIRTCSJZaEA8Y+UwhKOkDb9O5nc8YCclzC9ADGBocqadkW5pJX2m9FH3oETtKNdFZ0 WOEx1XpiuF99jF2VchTXH66H8gsaAEacQtgmvHNsb1fQw3KwnEQCxr6Hi/MrBueYRT20gs mbxQ6LqK0Jcgo+kbs/4Sib0BetRfuWYgHDOZLdnpon+V639FjZISdOzhUWTsceEyls+pIY ZaFSBWAxiuxAaaa8FCfv/iSPGWLDZFYw4dz2j+5CNlM+jy8Bi++zbAgxhWgzFSxFInCvWt QroNt8a2Oih564l/Nf0whpuCr6YrerxXQP6Ykc1kDw3920+5DlJhBHqq9jhgdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673812620; 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=M5h+8JHi/IkRqg2gWCwoYBNTSY9EFOxV5f2FJRpfiuQ=; b=KBkAKnm3mdcnIvNyMmkyueVk4fs//ZMbQAyUpwNSoBXcQtdSAYQ+xsKM+JbWuWy2J7xCXJ QlUMO8bBNnZykCRwEqWCRE8WrbqHUVnmDmzShnF+3ghsjjr/SOlYvAeenjvjZ8HZhmHy0u N64Gj9THWCKGtwyWlClSotHv8zTWed4Imfs33mS23PxjlWeTLgqojdaAgmmWY6BRUbpIxl 63BE7fMsbOZPEHZlzjjYI4tVtuo1tqKvrpOGz/Pghl39PP2aAZjriUbRHXn4HnHL/Ko3cI FCsomZLRyv3fhPZ/NCmqubAcFBv8YcM15Hb8LdPVI48TH9MixQtyouz4pybcQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673812620; a=rsa-sha256; cv=none; b=jWXcoBdP24cMrLdHAnjWumbaBY87grEovmldGdTiPQbZQUz9iFwBNSAq9vA+Hh9IRngE+G G2l/uTYNfMC2VaKyv35pnEooq85NM4Xns6R82MQSRLD8vkkUidTNcRv7JrXJIJXjt52ko3 xDTPhl1cN/IiZqK0i/vYcaJJBI3h0pwYLBaWJVS+ilHpQEwTcSSdagTjHMr8skrQXftrSA AF5bev++ZW8r/jorNlSkYr8aBifKpmABsxd0DFqUjibumgOTLsQHy7tNQNUq3SpY7aHX+P 14uFXpBPrGhQG2aaPUrNqjZQHRW1fK5JDKBzuFSzuMIfu2ilYCb0gOqysIbRVg== 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 4Nw5XD4BS3zffX; Sun, 15 Jan 2023 19:57:00 +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 30FJv0P5044782; Sun, 15 Jan 2023 19:57:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30FJv0oQ044781; Sun, 15 Jan 2023 19:57:00 GMT (envelope-from git) Date: Sun, 15 Jan 2023 19:57:00 GMT Message-Id: <202301151957.30FJv0oQ044781@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: fd932c22056b - main - devel/py-setuptools58: add 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: fd932c22056b7aed8fc14e3408437896a543cc95 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by vishwin: URL: https://cgit.FreeBSD.org/ports/commit/?id=fd932c22056b7aed8fc14e3408437896a543cc95 commit fd932c22056b7aed8fc14e3408437896a543cc95 Author: Charlie Li AuthorDate: 2023-01-02 05:04:00 +0000 Commit: Charlie Li CommitDate: 2023-01-15 19:55:02 +0000 devel/py-setuptools58: add This port will eventually serve as the one used in USE_PYTHON=distutils, namely for executing ${PYSETUP}. See https://wiki.freebsd.org/Python/setuptools for details. Approved by: fluffy (mentor) Differential Revision: https://reviews.freebsd.org/D38069 --- Mk/Uses/python.mk | 3 +- devel/Makefile | 1 + devel/py-setuptools58/Makefile | 48 +++++++++++++++++++++++ devel/py-setuptools58/distinfo | 3 ++ devel/py-setuptools58/files/easy-install.pth.dist | 2 + devel/py-setuptools58/files/pkg-message.in | 8 ++++ devel/py-setuptools58/pkg-descr | 8 ++++ 7 files changed, 72 insertions(+), 1 deletion(-) diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk index 0aa9b44f75d2..8ac80fcacd76 100644 --- a/Mk/Uses/python.mk +++ b/Mk/Uses/python.mk @@ -605,7 +605,8 @@ UNIQUE_FIND_SUFFIX_MAN_FILES+= ${_UNIQUE_FIND_SUFFIX_FILES} | \ _CURRENTPORT:= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} . if defined(_PYTHON_FEATURE_DISTUTILS) && \ - ${_CURRENTPORT} != ${PYTHON_PKGNAMEPREFIX}setuptools &&\ + ${_CURRENTPORT} != ${PYTHON_PKGNAMEPREFIX}setuptools && \ + ${_CURRENTPORT} != ${PYTHON_PKGNAMEPREFIX}setuptools58 && \ ${_CURRENTPORT} != ${PYTHON_PKGNAMEPREFIX}setuptools44 . if ${PYTHON_VER} == 2.7 BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools44>0:devel/py-setuptools44@${PY_FLAVOR} diff --git a/devel/Makefile b/devel/Makefile index 979840dee3d4..026f11c94eeb 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -5368,6 +5368,7 @@ SUBDIR += py-setuptools-pkg SUBDIR += py-setuptools-rust SUBDIR += py-setuptools44 + SUBDIR += py-setuptools58 SUBDIR += py-setuptools_hg SUBDIR += py-setuptools_scm SUBDIR += py-setuptools_scm_git_archive diff --git a/devel/py-setuptools58/Makefile b/devel/py-setuptools58/Makefile new file mode 100644 index 000000000000..6630578290d0 --- /dev/null +++ b/devel/py-setuptools58/Makefile @@ -0,0 +1,48 @@ +PORTNAME= setuptools +PORTVERSION= 58.5.3 +CATEGORIES= devel python +MASTER_SITES= CHEESESHOP +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMESUFFIX= 58 +DIST_SUBDIR= python + +# note: before committing to this port, contact portmgr to arrange for an +# experimental ports run. Untested commits may be backed out at portmgr's +# discretion. +MAINTAINER= python@FreeBSD.org +COMMENT= Python packages installer +WWW= https://pypi.org/project/setuptools/ + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE + +USES= cpe python:3.7+ +USE_PYTHON= allflavors autoplist concurrent distutils + +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 diff --git a/devel/py-setuptools58/distinfo b/devel/py-setuptools58/distinfo new file mode 100644 index 000000000000..bc632d47d468 --- /dev/null +++ b/devel/py-setuptools58/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1672635792 +SHA256 (python/setuptools-58.5.3.tar.gz) = dae6b934a965c8a59d6d230d3867ec408bb95e73bd538ff77e71fedf1eaca729 +SIZE (python/setuptools-58.5.3.tar.gz) = 2269854 diff --git a/devel/py-setuptools58/files/easy-install.pth.dist b/devel/py-setuptools58/files/easy-install.pth.dist new file mode 100644 index 000000000000..e7ab88be464d --- /dev/null +++ b/devel/py-setuptools58/files/easy-install.pth.dist @@ -0,0 +1,2 @@ +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 new file mode 100644 index 000000000000..2c33be99f2e5 --- /dev/null +++ b/devel/py-setuptools58/files/pkg-message.in @@ -0,0 +1,8 @@ +[ +{ type: install + message: <