Date: Thu, 30 Mar 2023 14:07:18 GMT From: Charlie Li <vishwin@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 1c796243aeb2 - main - devel/py-setuptools58: convert to PEP-517 Message-ID: <202303301407.32UE7Itv030413@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by vishwin: URL: https://cgit.FreeBSD.org/ports/commit/?id=1c796243aeb2c68eb82d7beddfddf06739560fc7 commit 1c796243aeb2c68eb82d7beddfddf06739560fc7 Author: Charlie Li <vishwin@FreeBSD.org> AuthorDate: 2023-03-30 14:05:04 +0000 Commit: Charlie Li <vishwin@FreeBSD.org> 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 <bsd.port.pre.mk> -.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 <bsd.port.post.mk> +.include <bsd.port.mk> 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: <<EOM - Only %%PREFIX%%/bin/easy_install-%%PYTHON_VER%% script has been installed - since Python %%PYTHON_VER%% is not the default Python version. -EOM -} -]
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202303301407.32UE7Itv030413>