Attachment 248818 Details for Bug 270358 – devel/py-setuptools: Update to 69.1.1

[patch] devel/py-setuptools: Update to 69.1.1

0001-devel-py-setuptools-Update-to-69.1.1.patch (text/plain), 4.19 KB, created by Alastair Hogge on 2024-02-29 00:16:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alastair Hogge

Created: 2024-02-29 00:16:43 UTC

Size: 4.19 KB

patch

obsolete

>From 3490d7548588c703bacf9ac963c23ad0209bb5f1 Mon Sep 17 00:00:00 2001
>From: Alastair Hogge <agh@riseup.net>
>Date: Fri, 16 Feb 2024 10:01:19 +0800
>Subject: [PATCH] devel/py-setuptools: Update to 69.1.1
>
>Update to 69.1.1:
>https://github.com/pypa/setuptools/compare/v63.1.0...v69.1.1
>
>- Drop obsolete patches
>- Port Makefile housekeeping
>- Switch to PEP517 build
>- Use ${DISTVERSION} over ${PORTVERSION}
>- Use bsd.port.options.mk/bsd.port.mk inclusion pair over legacy.
>
>PR:		270358
>---
> devel/py-setuptools/Makefile                  | 23 ++++++++-----------
> devel/py-setuptools/distinfo                  |  6 ++---
> .../py-setuptools/files/easy-install.pth.dist |  2 --
> .../files/patch-setuptools_package__index.py  | 11 ---------
> 4 files changed, 12 insertions(+), 30 deletions(-)
> delete mode 100644 devel/py-setuptools/files/easy-install.pth.dist
> delete mode 100644 devel/py-setuptools/files/patch-setuptools_package__index.py
>
>diff --git a/devel/py-setuptools/Makefile b/devel/py-setuptools/Makefile
>index fcb1ff843017..485cafd843b8 100644
>--- a/devel/py-setuptools/Makefile
>+++ b/devel/py-setuptools/Makefile
>@@ -1,6 +1,5 @@
> PORTNAME=	setuptools
>-PORTVERSION=	63.1.0
>-PORTREVISION=	1
>+DISTVERSION=	69.1.1
> CATEGORIES=	devel python
> MASTER_SITES=	PYPI
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -16,18 +15,16 @@ WWW=		https://pypi.org/project/setuptools/
> LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-USES=		cpe python
>-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
> CPE_VENDOR=	python
>+USE_PYTHON=	allflavors autoplist concurrent pep517
> 
>-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>
>+.include <bsd.port.options.mk>
> 
> .if ${FLAVOR} != ${FLAVORS:[1]}
> SUB_FILES+=	pkg-message
>@@ -39,10 +36,8 @@ SUB_LIST+=	PYTHON_VER=${PYTHON_VER}
> #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
>+	cd ${WRKSRC} && \
>+		${PYTHON_CMD} -m pytest -v -rs
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff --git a/devel/py-setuptools/distinfo b/devel/py-setuptools/distinfo
>index 79396fbdf202..e08599f8bb0c 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 = 1708911285
>+SHA256 (python/setuptools-69.1.1.tar.gz) = 5c0806c7d9af348e6dd3777b4f4dbb42c7ad85b190104837488eab9a7c945cf8
>+SIZE (python/setuptools-69.1.1.tar.gz) = 2219821
>diff --git a/devel/py-setuptools/files/easy-install.pth.dist b/devel/py-setuptools/files/easy-install.pth.dist
>deleted file mode 100644
>index e7ab88be464d..000000000000
>--- a/devel/py-setuptools/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-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
>- 
>- 
>-- 
>2.43.0
>

Actions: View | Diff

Attachments on bug 270358: 241004 | 241522 | 241717 | 242931 | 242941 | 242943 | 245574 | 246650 | 247216 | 248496 | 248818 | 249587