From eaaceccd1e5b86e4aa59f08f30dd19afea4f316b Mon Sep 17 00:00:00 2001 From: Muhammad Moinur Rahman Date: Thu, 27 Mar 2025 18:38:52 +0100 Subject: [PATCH] devel/py-setuptools44: Remove port --- .portsignore | 1 + Mk/Uses/python.mk | 12 +---- devel/Makefile | 1 - devel/py-setuptools44/Makefile | 52 ------------------- devel/py-setuptools44/distinfo | 3 -- .../files/easy-install.pth.dist | 2 - .../files/patch-setuptools_package__index.py | 11 ---- devel/py-setuptools44/files/pkg-message.in | 8 --- devel/py-setuptools44/pkg-descr | 8 --- 9 files changed, 2 insertions(+), 96 deletions(-) delete mode 100644 devel/py-setuptools44/Makefile delete mode 100644 devel/py-setuptools44/distinfo delete mode 100644 devel/py-setuptools44/files/easy-install.pth.dist delete mode 100644 devel/py-setuptools44/files/patch-setuptools_package__index.py delete mode 100644 devel/py-setuptools44/files/pkg-message.in delete mode 100644 devel/py-setuptools44/pkg-descr diff --git a/.portsignore b/.portsignore index 8378746c25a5..441aa95d9521 100644 --- a/.portsignore +++ b/.portsignore @@ -54,6 +54,7 @@ devel/papi devel/pear-HTML_Select_Common devel/py-fbprophet devel/py-game_sdl2 +devel/py-setuptools44 devel/py-setuptools58 devel/simian devel/vera++ diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk index 1b4b6f4a6a44..3eae453b9f31 100644 --- a/Mk/Uses/python.mk +++ b/Mk/Uses/python.mk @@ -667,14 +667,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}setuptools44 -. if ${PYTHON_VER} == 2.7 -BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools44>0:devel/py-setuptools44@${PY_FLAVOR} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools44>0:devel/py-setuptools44@${PY_FLAVOR} -. else + ${_CURRENTPORT} != ${PYTHON_PKGNAMEPREFIX}setuptools BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools>=63.1.0:devel/py-setuptools@${PY_FLAVOR} -. endif . endif . if defined(_PYTHON_FEATURE_PEP517) @@ -820,11 +814,7 @@ PYGAME= ${PYTHON_PKGNAMEPREFIX}game>0:devel/py-game@${PY_FLAVOR} PYNUMPY= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16,1<1.27,1:math/py-numpy@${PY_FLAVOR} . if defined(_PYTHON_FEATURE_DISTUTILS) -. if ${PYTHON_MAJOR_VER} < 3 -PY_SETUPTOOLS= ${PYTHON_PKGNAMEPREFIX}setuptools44>0:devel/py-setuptools44@${PY_FLAVOR} -. else PY_SETUPTOOLS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} -. endif . else PY_SETUPTOOLS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} . endif diff --git a/devel/Makefile b/devel/Makefile index 2947b18ccb5a..4172cfaa4ee9 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -5885,7 +5885,6 @@ SUBDIR += py-setuptools-pkg SUBDIR += py-setuptools-rust SUBDIR += py-setuptools-scm - SUBDIR += py-setuptools44 SUBDIR += py-setuptools_git_ls_files SUBDIR += py-setuptools_hg SUBDIR += py-setuptools_scm7 diff --git a/devel/py-setuptools44/Makefile b/devel/py-setuptools44/Makefile deleted file mode 100644 index 5ce729464799..000000000000 --- a/devel/py-setuptools44/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -PORTNAME= setuptools -PORTVERSION= 44.1.1 -PORTREVISION= 2 -CATEGORIES= devel python -MASTER_SITES= PYPI -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -PKGNAMESUFFIX= 44 -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:2.7 zip -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} -#.if ${PYTHON_REL} < 30000 -#TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} -#.endif -# 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-setuptools44/distinfo b/devel/py-setuptools44/distinfo deleted file mode 100644 index 53a7d9f86bde..000000000000 --- a/devel/py-setuptools44/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1626542180 -SHA256 (python/setuptools-44.1.1.zip) = c67aa55db532a0dadc4d2e20ba9961cbd3ccc84d544e9029699822542b5a476b -SIZE (python/setuptools-44.1.1.zip) = 858770 diff --git a/devel/py-setuptools44/files/easy-install.pth.dist b/devel/py-setuptools44/files/easy-install.pth.dist deleted file mode 100644 index e7ab88be464d..000000000000 --- a/devel/py-setuptools44/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-setuptools44/files/patch-setuptools_package__index.py b/devel/py-setuptools44/files/patch-setuptools_package__index.py deleted file mode 100644 index 85b8319a0b09..000000000000 --- a/devel/py-setuptools44/files/patch-setuptools_package__index.py +++ /dev/null @@ -1,11 +0,0 @@ ---- setuptools/package_index.py.orig 2022-07-04 02:25:25 UTC -+++ setuptools/package_index.py -@@ -197,7 +197,7 @@ def unique_values(func): - return wrapper - - --REL = re.compile(r"""<([^>]*\srel\s*=\s*['"]?([^'">]+)[^>]*)>""", re.I) -+REL = re.compile(r"""<([^>]*\srel\s{0,10}=\s{0,10}['"]?([^'" >]+)[^>]*)>""", re.I) - # this line is here to fix emacs' cruddy broken syntax highlighting - - diff --git a/devel/py-setuptools44/files/pkg-message.in b/devel/py-setuptools44/files/pkg-message.in deleted file mode 100644 index 2c33be99f2e5..000000000000 --- a/devel/py-setuptools44/files/pkg-message.in +++ /dev/null @@ -1,8 +0,0 @@ -[ -{ type: install - message: <