diff --git a/devel/py-setuptools/Makefile b/devel/py-setuptools/Makefile index fcb1ff843017..a9a4fe79d66e 100644 --- a/devel/py-setuptools/Makefile +++ b/devel/py-setuptools/Makefile @@ -1,48 +1,47 @@ PORTNAME= setuptools -PORTVERSION= 63.1.0 -PORTREVISION= 1 +PORTVERSION= 68.0.0 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} 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 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-setuptools/distinfo b/devel/py-setuptools/distinfo index 79396fbdf202..fd4cc724c303 100644 --- a/devel/py-setuptools/distinfo +++ b/devel/py-setuptools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1657634036 -SHA256 (python/setuptools-63.1.0.tar.gz) = 16923d366ced322712c71ccb97164d07472abeecd13f3a6c283f6d5d26722793 -SIZE (python/setuptools-63.1.0.tar.gz) = 2599380 +TIMESTAMP = 1697024825 +SHA256 (python/setuptools-68.0.0.tar.gz) = baf1fdb41c6da4cd2eae722e135500da913332ab3f2f5c7d33af9b492acb5235 +SIZE (python/setuptools-68.0.0.tar.gz) = 2194111 diff --git a/devel/py-setuptools/files/patch-setuptools_package__index.py b/devel/py-setuptools/files/patch-setuptools_package__index.py deleted file mode 100644 index 85b8319a0b09..000000000000 --- a/devel/py-setuptools/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 - -