tech-pkg archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Removing python 2.7 from the default set



Hi!

This patch changes the default PYTHON_VERSIONS_ACCEPTED to only list
Python 3.x. A package can (still) explicitly set
PYTHON_VERSIONS_ACCEPTED, or set PYTHON_27_ACCEPTED to support all
Python 3 versions and additionally Python 2.

Most Python modules don't support Python 2 any longer. This change
will make it less likely that a newly imported package will break
pbulks because it hasn't disabled Python 2 support, because now
packages explicitly need to enable Python 2 support.

The diff survives my test bulk build of */py-* but I can't start a
full bulk build. Can someone who is running one please confirm that
this doesn't break that?
 Thomas
Index: comms/py-serial/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/comms/py-serial/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- comms/py-serial/Makefile	17 Apr 2024 10:38:33 -0000	1.12
+++ comms/py-serial/Makefile	16 May 2024 19:52:45 -0000
@@ -18,6 +18,7 @@
 REPLACE_PYTHON=	serial/*.py serial/*/*.py
 
 USE_PKG_RESOURCES=	yes
+PYTHON_27_ACCEPTED=	yes
 
 post-install:
 .for bin in pyserial-miniterm pyserial-ports
Index: databases/py-bsddb3/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/databases/py-bsddb3/Makefile,v
retrieving revision 1.60
diff -u -r1.60 Makefile
--- databases/py-bsddb3/Makefile	4 Jan 2022 20:52:41 -0000	1.60
+++ databases/py-bsddb3/Makefile	16 May 2024 19:52:46 -0000
@@ -30,6 +30,8 @@
 
 MAKE_ENV+=		YES_I_HAVE_THE_RIGHT_TO_USE_THIS_BERKELEY_DB_VERSION=1
 
+PYTHON_27_ACCEPTED=	yes
+
 do-test:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHONBIN} test.py
 
Index: devel/py-argparse/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/py-argparse/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- devel/py-argparse/Makefile	4 Jan 2022 20:52:50 -0000	1.10
+++ devel/py-argparse/Makefile	16 May 2024 19:52:49 -0000
@@ -13,5 +13,7 @@
 
 USE_LANGUAGES=	# none
 
+PYTHON_27_ACCEPTED=	yes
+
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
Index: devel/py-backports/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/py-backports/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- devel/py-backports/Makefile	29 Mar 2023 09:34:05 -0000	1.5
+++ devel/py-backports/Makefile	16 May 2024 19:52:49 -0000
@@ -12,6 +12,8 @@
 
 PY_PATCHPLIST=	yes
 
+PYTHON_27_ACCEPTED=	yes
+
 .include "../../lang/python/pyversion.mk"
 
 INSTALLATION_DIRS+=	${PYSITELIB}/backports
Index: devel/py-sortedcontainers/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/py-sortedcontainers/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- devel/py-sortedcontainers/Makefile	4 Jan 2022 20:53:39 -0000	1.9
+++ devel/py-sortedcontainers/Makefile	16 May 2024 19:52:49 -0000
@@ -15,5 +15,7 @@
 
 USE_LANGUAGES=	# none
 
+PYTHON_27_ACCEPTED=	yes
+
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
Index: filesystems/py-fuse-bindings/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/filesystems/py-fuse-bindings/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- filesystems/py-fuse-bindings/Makefile	21 Oct 2023 17:10:11 -0000	1.24
+++ filesystems/py-fuse-bindings/Makefile	16 May 2024 19:52:51 -0000
@@ -18,6 +18,9 @@
 INSTALLATION_DIRS=	${EGDIR}
 PLIST_SUBST+=		PYPKGPREFIX=${PYPKGPREFIX}
 PRINT_PLIST_AWK+=	{ gsub("${PYPKGPREFIX}-", "$${PYPKGPREFIX}-"); }
+
+PYTHON_27_ACCEPTED=	yes
+
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/example/hello.py \
 		${DESTDIR}${PREFIX}/${EGDIR}
Index: lang/py-six/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/lang/py-six/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- lang/py-six/Makefile	30 Apr 2023 19:40:20 -0000	1.21
+++ lang/py-six/Makefile	16 May 2024 19:52:54 -0000
@@ -15,6 +15,7 @@
 
 PYSETUPTESTTARGET=	pytest
 
+PYTHON_27_ACCEPTED=	yes
 .include "../../lang/python/pyversion.mk"
 
 .if ${PYTHON_VERSION} > 300
Index: lang/python/pyversion.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/python/pyversion.mk,v
retrieving revision 1.159
diff -u -r1.159 pyversion.mk
--- lang/python/pyversion.mk	10 May 2024 10:32:07 -0000	1.159
+++ lang/python/pyversion.mk	16 May 2024 19:52:54 -0000
@@ -31,7 +31,7 @@
 #	preferred over later ones.
 #
 #	Possible values: 312 311 310 39 38 27
-#	Default: 312 311 310 39 38 27
+#	Default: 312 311 310 39 38
 #
 # PYTHON_VERSIONS_INCOMPATIBLE
 #	The Python versions that are NOT acceptable for the package.
@@ -107,7 +107,10 @@
 .else
 PYTHON_VERSION_DEFAULT?=		310
 .endif
-PYTHON_VERSIONS_ACCEPTED?=		312 311 310 39 38 27
+PYTHON_VERSIONS_ACCEPTED?=		312 311 310 39 38
+.if defined(PYTHON_27_ACCEPTED)
+PYTHON_VERSIONS_ACCEPTED+=		27
+.endif
 PYTHON_VERSIONS_INCOMPATIBLE?=		# empty by default
 
 # transform the list into individual variables
Index: net/py-ipcalc/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/py-ipcalc/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- net/py-ipcalc/Makefile	10 Jan 2022 20:35:50 -0000	1.3
+++ net/py-ipcalc/Makefile	16 May 2024 19:52:55 -0000
@@ -13,5 +13,7 @@
 
 USE_LANGUAGES=	# none
 
+PYTHON_27_ACCEPTED=	yes
+
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
Index: security/py-cryptodome/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/py-cryptodome/Makefile,v
retrieving revision 1.53
diff -u -r1.53 Makefile
--- security/py-cryptodome/Makefile	12 Jan 2024 13:15:47 -0000	1.53
+++ security/py-cryptodome/Makefile	16 May 2024 19:52:59 -0000
@@ -18,6 +18,7 @@
 
 CHECK_PORTABILITY_SKIP=	appveyor/get_wheels.sh
 
+PYTHON_27_ACCEPTED=	yes
 .include "../../lang/python/egg.mk"
 
 # Python 3 builds of this package get an extra "abi3" suffix added
Index: security/py-ecdsa/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/py-ecdsa/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- security/py-ecdsa/Makefile	10 Apr 2024 11:16:20 -0000	1.16
+++ security/py-ecdsa/Makefile	16 May 2024 19:52:59 -0000
@@ -15,6 +15,8 @@
 
 USE_LANGUAGES=	# none
 
+PYTHON_27_ACCEPTED=	yes
+
 do-test:
 	cd ${WRKSRC}/src && ${SETENV} ${TEST_ENV} ${PYTHONBIN} -m unittest discover -v
 
Index: textproc/py-feedparser5/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/py-feedparser5/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- textproc/py-feedparser5/Makefile	4 Jan 2022 20:54:55 -0000	1.4
+++ textproc/py-feedparser5/Makefile	16 May 2024 19:53:03 -0000
@@ -15,6 +15,8 @@
 
 USE_LANGUAGES=		#none
 
+PYTHON_27_ACCEPTED=	yes
+
 .include "../../lang/python/pyversion.mk"
 
 .if ${PYPKGPREFIX} != "py27"
Index: textproc/py-libxml2/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/py-libxml2/Makefile,v
retrieving revision 1.94
diff -u -r1.94 Makefile
--- textproc/py-libxml2/Makefile	27 Jan 2024 10:07:46 -0000	1.94
+++ textproc/py-libxml2/Makefile	16 May 2024 19:53:03 -0000
@@ -1,5 +1,7 @@
 # $NetBSD: Makefile,v 1.94 2024/01/27 10:07:46 wiz Exp $
 
+PYTHON_27_ACCEPTED=	yes
+
 .include "../../textproc/libxml2/Makefile.common"
 
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}


Home | Main Index | Thread Index | Old Index