Forget about Python 3.6

125 files changed, 237 insertions, 277 deletions

diff --git a/audio/py-music21/Makefile b/audio/py-music21/Makefile
index ffed135bfa9..159662df176 100644
--- a/audio/py-music21/Makefile
+++ b/audio/py-music21/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2021/09/16 00:23:52 gutteridge Exp $
+# $NetBSD: Makefile,v 1.15 2021/12/30 13:05:27 adam Exp $
 
 VERSION=	7.1.0
 DISTNAME=	music21-noCorpus-${VERSION}
@@ -13,7 +13,7 @@ HOMEPAGE=	https://github.com/cuthbertLab/music21
 COMMENT=	Python toolkit for computer-aided musical analysis
 LICENSE=	modified-bsd OR gnu-lgpl-v3
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36 # py-scipy
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-scipy
 
 EGG_NAME=	music21-${VERSION}
 
diff --git a/biology/py-biopython/Makefile b/biology/py-biopython/Makefile
index b7f846638bd..7bdacea256c 100644
--- a/biology/py-biopython/Makefile
+++ b/biology/py-biopython/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2021/06/29 08:41:59 nia Exp $
+# $NetBSD: Makefile,v 1.6 2021/12/30 13:05:27 adam Exp $
 
 DISTNAME=	biopython-1.74
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -15,8 +15,6 @@ USE_TOOLS+=	pax
 
 INSTALLATION_DIRS+=	share/doc/biopython share/examples/biopython
 
-PYTHON_VERSIONS_INCOMPATIBLE=	36 # py-numpy
-
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/README.rst ${DESTDIR}${PREFIX}/share/doc/biopython
 	${INSTALL_DATA} ${WRKSRC}/Doc/Tutorial.pdf ${DESTDIR}${PREFIX}/share/doc/biopython
diff --git a/biology/py-cutadapt/Makefile b/biology/py-cutadapt/Makefile
index a6b01b225c1..8c345d23888 100644
--- a/biology/py-cutadapt/Makefile
+++ b/biology/py-cutadapt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2021/04/22 08:36:59 nia Exp $
+# $NetBSD: Makefile,v 1.6 2021/12/30 13:05:27 adam Exp $
 
 DISTNAME=	cutadapt-3.4
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -15,7 +15,7 @@ TOOL_DEPENDS+=	${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_sc
 DEPENDS+=	${PYPKGPREFIX}-dnaio>=0.5.0:../../biology/py-dnaio
 DEPENDS+=	${PYPKGPREFIX}-xopen>=1.0.0:../../devel/py-xopen
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36 # py-xopen, dataclasses
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-xopen, dataclasses
 
 post-install:
 	cd ${DESTDIR}${PREFIX}/bin && \
diff --git a/cad/py-gds/Makefile b/cad/py-gds/Makefile
index fcd0b44546c..8e15e2a4327 100644
--- a/cad/py-gds/Makefile
+++ b/cad/py-gds/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2021/07/01 14:48:31 nia Exp $
+# $NetBSD: Makefile,v 1.17 2021/12/30 13:05:28 adam Exp $
 
 DISTNAME=	gdspy-1.6
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -12,8 +12,6 @@ HOMEPAGE=	https://github.com/heitzmann/gdspy
 COMMENT=	Python module for creating GDSII stream files
 LICENSE=	boost-license
 
-PYTHON_VERSIONS_INCOMPATIBLE=	36 # py-numpy
-
 .include "../../lang/python/pyversion.mk"
 .if ${_PYTHON_VERSION} == 27
 DEPENDS+=	${PYPKGPREFIX}-future-[0-9]*:../../devel/py-future
diff --git a/chat/gajim/Makefile b/chat/gajim/Makefile
index be0d2708ebc..66dad90fa5e 100644
--- a/chat/gajim/Makefile
+++ b/chat/gajim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2021/12/08 16:03:27 adam Exp $
+# $NetBSD: Makefile,v 1.59 2021/12/30 13:05:28 adam Exp $
 
 DISTNAME=	gajim-1.3.2
 PKGREVISION=	1
@@ -22,7 +22,7 @@ TOOLS_PLATFORM.msgfmt=
 MANCOMPRESSED=	yes
 MAKE_ENV+=	PKGMANDIR=${PKGMANDIR}
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 DEPENDS+=	${PYPKGPREFIX}-cairo>=1.16.0:../../graphics/py-cairo
 DEPENDS+=	${PYPKGPREFIX}-css-parser-[0-9]*:../../textproc/py-css-parser
diff --git a/chat/maubot/Makefile b/chat/maubot/Makefile
index 68b5032d1d2..7355b4795fa 100644
--- a/chat/maubot/Makefile
+++ b/chat/maubot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2021/07/14 08:29:19 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2021/12/30 13:05:28 adam Exp $
 
 DISTNAME=	maubot-0.1.0
 PKGREVISION=	2
@@ -26,7 +26,7 @@ DEPENDS+=	${PYPKGPREFIX}-jinja2>=2<3:../../textproc/py-jinja2
 
 USE_LANGUAGES=	# none
  
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 INSTALLATION_DIRS+=	share/maubot
 
diff --git a/chat/mautrix-hangouts/Makefile b/chat/mautrix-hangouts/Makefile
index 79bf99f8082..d3cab2ecf09 100644
--- a/chat/mautrix-hangouts/Makefile
+++ b/chat/mautrix-hangouts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2021/09/15 11:49:50 nia Exp $
+# $NetBSD: Makefile,v 1.14 2021/12/30 13:05:28 adam Exp $
 
 DISTNAME=	mautrix-hangouts-0.1.4
 PKGREVISION=	1
@@ -25,7 +25,7 @@ DEPENDS+=	${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
 USE_TOOLS+=	pax
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 EGG_NAME=	mautrix_hangouts-${PKGVERSION_NOREV}+dev.unknown
 
diff --git a/chat/mautrix-telegram/Makefile b/chat/mautrix-telegram/Makefile
index 9bcc5446cd4..d9a63993112 100644
--- a/chat/mautrix-telegram/Makefile
+++ b/chat/mautrix-telegram/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2021/09/14 20:01:48 js Exp $
+# $NetBSD: Makefile,v 1.7 2021/12/30 13:05:28 adam Exp $
 
 DISTNAME=	mautrix-telegram-0.10.1
 CATEGORIES=	chat python
@@ -32,7 +32,7 @@ DEPENDS+=	${PYPKGPREFIX}-qrcode>=6<7:../../graphics/py-qrcode
 USE_TOOLS+=	pax
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 EGG_NAME=	mautrix_telegram-${PKGVERSION_NOREV}+dev.unknown
 
diff --git a/chat/py-mautrix/Makefile b/chat/py-mautrix/Makefile
index 8ae223d6180..9fae4de83dd 100644
--- a/chat/py-mautrix/Makefile
+++ b/chat/py-mautrix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2021/09/14 19:19:35 js Exp $
+# $NetBSD: Makefile,v 1.13 2021/12/30 13:05:28 adam Exp $
 
 DISTNAME=	mautrix-python-0.10.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/-python//}
@@ -13,7 +13,7 @@ HOMEPAGE=	https://github.com/tulir/mautrix-python
 COMMENT=	Python 3 asyncio Matrix framework
 LICENSE=	mpl-2.0
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 DEPENDS+=	${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
 DEPENDS+=	${PYPKGPREFIX}-aiohttp>=3<4:../../www/py-aiohttp
diff --git a/chat/py-nbxmpp/Makefile b/chat/py-nbxmpp/Makefile
index 59ed9f8bc3f..77d155430ec 100644
--- a/chat/py-nbxmpp/Makefile
+++ b/chat/py-nbxmpp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2021/08/10 12:03:37 nia Exp $
+# $NetBSD: Makefile,v 1.7 2021/12/30 13:05:28 adam Exp $
 
 DISTNAME=	nbxmpp-2.0.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -17,7 +17,7 @@ DEPENDS+=	${PYPKGPREFIX}-precis-i18n>=1.0.0:../../textproc/py-precis-i18n
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/tootstream/Makefile b/chat/tootstream/Makefile
index 51391f1735b..df26a597a0c 100644
--- a/chat/tootstream/Makefile
+++ b/chat/tootstream/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2020/12/04 20:45:03 nia Exp $
+# $NetBSD: Makefile,v 1.13 2021/12/30 13:05:28 adam Exp $
 
 DISTNAME=	tootstream-0.3.8.1
 PKGREVISION=	1
@@ -16,7 +16,7 @@ USE_LANGUAGES=	# none
 # incompatible with python 2.
 # strange locale errors on earlier versions of python 3, related
 # to py-click.
-PYTHON_VERSIONS_INCOMPATIBLE+=	27 36
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 DEPENDS+=	${PYPKGPREFIX}-click>=6.7:../../devel/py-click
 DEPENDS+=	${PYPKGPREFIX}-colored>=1.3.93:../../textproc/py-colored
diff --git a/databases/gramps5/Makefile b/databases/gramps5/Makefile
index 66a8dada56b..6342cd0dd3d 100644
--- a/databases/gramps5/Makefile
+++ b/databases/gramps5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2020/12/04 20:45:04 nia Exp $
+# $NetBSD: Makefile,v 1.6 2021/12/30 13:05:29 adam Exp $
 
 DISTNAME=		gramps-5.1.2
 PKGREVISION=		3
@@ -12,7 +12,7 @@ LICENSE=		gnu-gpl-v2
 
 USE_TOOLS+=		msgfmt pkg-config intltool msgconv
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 REPLACE_PYTHON+=	gramps/gen/utils/place.py
 REPLACE_PYTHON+=	gramps/gen/datehandler/_date_fr.py
diff --git a/databases/py-asyncpg/Makefile b/databases/py-asyncpg/Makefile
index e010a819951..2a9c9645e19 100644
--- a/databases/py-asyncpg/Makefile
+++ b/databases/py-asyncpg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2021/12/16 12:50:08 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2021/12/30 13:05:29 adam Exp $
 
 DISTNAME=	asyncpg-0.25.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -14,7 +14,7 @@ TEST_DEPENDS+=	${PYPKGPREFIX}-codestyle>=2.7.0:../../devel/py-codestyle
 TEST_DEPENDS+=	${PYPKGPREFIX}-flake8>=3.9.2:../../devel/py-flake8
 TEST_DEPENDS+=	${PYPKGPREFIX}-uvloop>=0.15.3:../../devel/py-uvloop
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 .include "../../lang/python/pyversion.mk"
 .if ${_PYTHON_VERSION} < 38
diff --git a/databases/py-kb/Makefile b/databases/py-kb/Makefile
index ce373527fca..622323c4a05 100644
--- a/databases/py-kb/Makefile
+++ b/databases/py-kb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2021/05/29 10:22:25 leot Exp $
+# $NetBSD: Makefile,v 1.2 2021/12/30 13:05:29 adam Exp $
 
 DISTNAME=	kb-manager-0.1.6
 EGGNAME=	${DISTNAME:S/-manager//}
@@ -17,8 +17,8 @@ DEPENDS+=	${PYPKGPREFIX}-gitpython-[0-9]*:../../devel/py-gitpython
 DEPENDS+=	${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
 DEPENDS+=	${PYPKGPREFIX}-toml-[0-9]*:../../textproc/py-toml
 
-# Not for 2.7.  3.6 and 3.7 would need py-attr that is currently not packaged
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36 37
+# Not for 2.7. 3.7 would need py-attr that is currently not packaged
+PYTHON_VERSIONS_INCOMPATIBLE=	27 37
 
 USE_LANGUAGES=	# none
 
diff --git a/databases/py-tortoise-orm/Makefile b/databases/py-tortoise-orm/Makefile
index e9c3cb6b7e4..df85d65e115 100644
--- a/databases/py-tortoise-orm/Makefile
+++ b/databases/py-tortoise-orm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2021/02/05 07:51:22 adam Exp $
+# $NetBSD: Makefile,v 1.15 2021/12/30 13:05:29 adam Exp $
 
 DISTNAME=	tortoise-orm-0.16.21
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -21,7 +21,7 @@ DEPENDS+=	${PYPKGPREFIX}-uvloop>=0.14.0:../../devel/py-uvloop
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-anyio/Makefile b/devel/py-anyio/Makefile
index 4e770649ff9..6899a736bb4 100644
--- a/devel/py-anyio/Makefile
+++ b/devel/py-anyio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2021/11/23 09:04:01 adam Exp $
+# $NetBSD: Makefile,v 1.8 2021/12/30 13:05:29 adam Exp $
 
 DISTNAME=	anyio-3.4.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -22,7 +22,7 @@ TEST_DEPENDS+=	${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
 TEST_DEPENDS+=	${PYPKGPREFIX}-trustme-[0-9]*:../../security/py-trustme
 #TEST_DEPEDS+=	${PYPKGPREFIX}-trio
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36 # py-uvloop
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-uvloop
 
 .include "../../lang/python/pyversion.mk"
 .if ${_PYTHON_VERSION} < 38
diff --git a/devel/py-backports.cached-property/Makefile b/devel/py-backports.cached-property/Makefile
index 1b86090e1aa..878cfcca50f 100644
--- a/devel/py-backports.cached-property/Makefile
+++ b/devel/py-backports.cached-property/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2021/11/08 12:27:36 adam Exp $
+# $NetBSD: Makefile,v 1.2 2021/12/30 13:05:29 adam Exp $
 
 DISTNAME=	backports.cached-property-1.0.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -14,7 +14,7 @@ BUILD_DEPENDS+=	${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_s
 BUILD_DEPENDS+=	${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
 DEPENDS+=	${PYPKGPREFIX}-backports>=1.0nb2:../../devel/py-backports
 
-PYTHON_VERSIONS_ACCEPTED=	37 36 # included in Python 3.8+
+PYTHON_VERSIONS_ACCEPTED=	37 # included in Python 3.8+
 
 post-install:
 	${RM} -f -r ${DESTDIR}${PREFIX}/${PYSITELIB}/backports/__init__.*
diff --git a/devel/py-boost/Makefile b/devel/py-boost/Makefile
index 6c852c19338..d13a306285f 100644
--- a/devel/py-boost/Makefile
+++ b/devel/py-boost/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2021/12/24 22:28:28 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2021/12/30 13:05:29 adam Exp $
 
 BOOST_PACKAGE=		python
 BOOST_COMMENT=		(Boost.Python binary library)
@@ -15,8 +15,6 @@ BJAM_ARGS+=		--user-config=${WRKSRC}/user-config.jam
 BJAM_ARGS+=		--with-python
 MAKE_ENV+=		BOOST_BUILD_PATH=${WRKSRC}
 
-PYTHON_VERSIONS_INCOMPATIBLE=	36 # py-numpy
-
 .include "../../devel/boost-jam/bjam.mk"
 .include "../../lang/python/pyversion.mk"
 
diff --git a/devel/py-gitinspector/Makefile b/devel/py-gitinspector/Makefile
index a3e4d869944..a241b057047 100644
--- a/devel/py-gitinspector/Makefile
+++ b/devel/py-gitinspector/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2021/02/25 02:03:47 markd Exp $
+# $NetBSD: Makefile,v 1.5 2021/12/30 13:05:29 adam Exp $
 
 GITHUB_PROJECT=	gitinspector
 DISTNAME=	gitinspector-0.4.4
@@ -15,8 +15,6 @@ LICENSE=	gnu-gpl-v3
 
 DEPENDS+=	git-base-[0-9]*:../../devel/git-base
 
-PYTHON_VERSIONS_INCOMPATIBLE=	36
-
 post-install:
 	${MV} ${DESTDIR}${PREFIX}/bin/gitinspector \
 		${DESTDIR}${PREFIX}/bin/gitinspector-${PYVERSSUFFIX}
diff --git a/devel/py-gobject/Makefile b/devel/py-gobject/Makefile
index 07e3b3b716d..9e02c4f01e1 100644
--- a/devel/py-gobject/Makefile
+++ b/devel/py-gobject/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.61 2021/12/08 16:02:02 adam Exp $
+# $NetBSD: Makefile,v 1.62 2021/12/30 13:05:30 adam Exp $
 
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/^py//}
 PKGREVISION=	4
 
 PYTHON_VERSIONED_DEPENDENCIES+=	cairo
 
-PYTHON_VERSIONS_ACCEPTED=	37 36 27
+PYTHON_VERSIONS_ACCEPTED=	37 27
 
 .include "Makefile.common"
 
diff --git a/devel/py-h5py/Makefile b/devel/py-h5py/Makefile
index 97be47b2169..f96a0d21379 100644
--- a/devel/py-h5py/Makefile
+++ b/devel/py-h5py/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2021/06/07 11:57:50 adam Exp $
+# $NetBSD: Makefile,v 1.11 2021/12/30 13:05:30 adam Exp $
 
 DISTNAME=	h5py-3.2.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -15,7 +15,7 @@ DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 
 MAKE_ENV=	HDF5_DIR=${PREFIX}
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 BUILDLINK_API_DEPENDS.hdf5+=	hdf5>=1.10
 .include "../../devel/hdf5/buildlink3.mk"
diff --git a/devel/py-hash/Makefile b/devel/py-hash/Makefile
index a614e67df29..cfcafa09a8a 100644
--- a/devel/py-hash/Makefile
+++ b/devel/py-hash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2021/06/29 08:41:59 nia Exp $
+# $NetBSD: Makefile,v 1.10 2021/12/30 13:05:30 adam Exp $
 
 DISTNAME=	pyfasthash-0.6.2
 PKGNAME=	${DISTNAME:S/pyfast/${PYPKGPREFIX}-/}
@@ -25,8 +25,6 @@ CPPFLAGS+=	-DHASH_LITTLE_ENDIAN=1 -DHASH_BIG_ENDIAN=0
 CPPFLAGS+=	-DHASH_LITTLE_ENDIAN=0 -DHASH_BIG_ENDIAN=1
 .endif
 
-PYTHON_VERSIONS_INCOMPATIBLE=	36 # py-numpy
-
 .include "../../devel/py-boost/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-ipykernel/Makefile b/devel/py-ipykernel/Makefile
index b3b3b7b1858..05ad84952bb 100644
--- a/devel/py-ipykernel/Makefile
+++ b/devel/py-ipykernel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2021/09/18 12:16:03 mef Exp $
+# $NetBSD: Makefile,v 1.28 2021/12/30 13:05:30 adam Exp $
 
 DISTNAME=	ipykernel-5.5.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -28,10 +28,10 @@ DEPENDS+=	${PYPKGPREFIX}-appnope-[0-9]*:../../sysutils/py-appnope
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 do-test:
-	cd ${WRKSRC} && pytest-${PYVERSSUFFIX}
+	cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX}
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-ipython/Makefile b/devel/py-ipython/Makefile
index e148f7f5f11..f5dc6896dca 100644
--- a/devel/py-ipython/Makefile
+++ b/devel/py-ipython/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2021/12/10 09:06:13 adam Exp $
+# $NetBSD: Makefile,v 1.68 2021/12/30 13:05:30 adam Exp $
 
 DISTNAME=	ipython-7.30.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -28,7 +28,7 @@ DEPENDS+=	${PYPKGPREFIX}-appnope-[0-9]*:../../sysutils/py-appnope
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 post-install:
 	cd ${DESTDIR}${PREFIX} && \
diff --git a/devel/py-iso3166/Makefile b/devel/py-iso3166/Makefile
index df04b14db55..313663ec3ea 100644
--- a/devel/py-iso3166/Makefile
+++ b/devel/py-iso3166/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2021/12/16 13:44:02 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2021/12/30 13:05:30 adam Exp $
 
 DISTNAME=	iso3166-2.0.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
@@ -14,7 +14,7 @@ TEST_DEPENDS+=	${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 do-test:
 	cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX} tests
diff --git a/devel/py-jupyter-console/Makefile b/devel/py-jupyter-console/Makefile
index 3ca0ea1c5d6..1c647baf6a2 100644
--- a/devel/py-jupyter-console/Makefile
+++ b/devel/py-jupyter-console/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2021/06/10 18:53:58 adam Exp $
+# $NetBSD: Makefile,v 1.4 2021/12/30 13:05:30 adam Exp $
 
 DISTNAME=	jupyter_console-6.4.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/_/-/}
@@ -18,7 +18,7 @@ DEPENDS+=	${PYPKGPREFIX}-pygments>=2.3.1:../../textproc/py-pygments
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36	# py-ipykernel
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-ipykernel
 
 post-install:
 	cd ${DESTDIR}${PREFIX}/bin && \
diff --git a/devel/py-jupyter_client/Makefile b/devel/py-jupyter_client/Makefile
index ae4298b2640..ce440da99e0 100644
--- a/devel/py-jupyter_client/Makefile
+++ b/devel/py-jupyter_client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2021/10/09 23:20:24 gutteridge Exp $
+# $NetBSD: Makefile,v 1.22 2021/12/30 13:05:30 adam Exp $
 
 DISTNAME=	jupyter_client-6.1.12
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -26,7 +26,7 @@ TEST_DEPENDS+=	${PYPKGPREFIX}-test-timeout-[0-9]*:../../devel/py-test-timeout
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 post-install:
 	cd ${DESTDIR}${PREFIX}/bin && \
diff --git a/devel/py-jupyter_core/Makefile b/devel/py-jupyter_core/Makefile
index 7308c8c94ca..9bc4ca58ada 100644
--- a/devel/py-jupyter_core/Makefile
+++ b/devel/py-jupyter_core/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2021/06/29 08:34:18 nia Exp $
+# $NetBSD: Makefile,v 1.14 2021/12/30 13:05:31 adam Exp $
 
 DISTNAME=	jupyter_core-4.7.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -16,7 +16,7 @@ TEST_DEPENDS+=	${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 SUBST_CLASSES+=			fix-prefix
 SUBST_STAGE.fix-prefix=		pre-configure
diff --git a/devel/py-line_profiler/Makefile b/devel/py-line_profiler/Makefile
index 13098c03cc3..7674f38ac54 100644
--- a/devel/py-line_profiler/Makefile
+++ b/devel/py-line_profiler/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2021/06/11 07:11:27 adam Exp $
+# $NetBSD: Makefile,v 1.9 2021/12/30 13:05:31 adam Exp $
 
 DISTNAME=	line_profiler-2.1.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -16,8 +16,6 @@ post-install:
 	cd ${DESTDIR}${PREFIX}/bin && \
 		${MV} kernprof kernprof${PYVERSSUFFIX} || ${TRUE}
 
-PYTHON_VERSIONS_INCOMPATIBLE=	36
-
 PYTHON_VERSIONED_DEPENDENCIES=	ipython
 
 .include "../../lang/python/pyversion.mk"
diff --git a/devel/py-manticore/Makefile b/devel/py-manticore/Makefile
index 834c335a17c..c885bc4d265 100644
--- a/devel/py-manticore/Makefile
+++ b/devel/py-manticore/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2020/12/30 12:04:08 nia Exp $
+# $NetBSD: Makefile,v 1.15 2021/12/30 13:05:31 adam Exp $
 
 .include "../../devel/py-angr/version.mk"
 
@@ -29,7 +29,7 @@ DEPENDS+=	${PYPKGPREFIX}-ptable-[0-9]*:../../textproc/py-ptable
 DEPENDS+=	${PYPKGPREFIX}-wasm-[0-9]*:../../devel/py-wasm
 DEPENDS+=	${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 post-install:
 .for alternative in bin/manticore bin/manticore-verifier
diff --git a/devel/py-memory-profiler/Makefile b/devel/py-memory-profiler/Makefile
index 8083230664e..2045f9ce1af 100644
--- a/devel/py-memory-profiler/Makefile
+++ b/devel/py-memory-profiler/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2021/12/19 16:57:00 adam Exp $
+# $NetBSD: Makefile,v 1.8 2021/12/30 13:05:31 adam Exp $
 
 DISTNAME=	memory_profiler-0.60.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/_/-/}
@@ -15,7 +15,7 @@ DEPENDS+=	${PYPKGPREFIX}-psutil-[0-9]*:../../sysutils/py-psutil
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36	# py-matplotlib
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-matplotlib
 
 post-install:
 	cd ${DESTDIR}${PREFIX}/bin && \
diff --git a/devel/py-pygit2/Makefile b/devel/py-pygit2/Makefile
index 989bda859d2..44db110fb00 100644
--- a/devel/py-pygit2/Makefile
+++ b/devel/py-pygit2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2021/12/16 14:29:56 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2021/12/30 13:05:31 adam Exp $
 
 DISTNAME=	pygit2-1.6.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -14,7 +14,7 @@ DEPENDS+=	${PYPKGPREFIX}-cffi-[0-9]*:../../devel/py-cffi
 TEST_DEPENDS+=	${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 TEST_DEPENDS+=	${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 .include "../../lang/python/pyversion.mk"
 .if ${_PYTHON_VERSION} < 38
diff --git a/devel/py-traitlets/Makefile b/devel/py-traitlets/Makefile
index 41df05ecbc0..b2b9848fd92 100644
--- a/devel/py-traitlets/Makefile
+++ b/devel/py-traitlets/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2021/10/26 08:34:06 adam Exp $
+# $NetBSD: Makefile,v 1.11 2021/12/30 13:05:31 adam Exp $
 
 DISTNAME=	traitlets-5.1.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -14,7 +14,7 @@ USE_LANGUAGES=	# none
 
 # Traitlets 5.0+ supports Python 3.7 and above, following NEP 29.
 # For any earlier version of Python use traitlets 4.x
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-uvloop/Makefile b/devel/py-uvloop/Makefile
index 7dcad6082e2..4dd69013970 100644
--- a/devel/py-uvloop/Makefile
+++ b/devel/py-uvloop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2021/08/11 07:03:57 adam Exp $
+# $NetBSD: Makefile,v 1.27 2021/12/30 13:05:31 adam Exp $
 
 DISTNAME=	uvloop-0.16.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -14,7 +14,7 @@ DEPENDS+=	libuv>=1.42.0:../../devel/libuv
 TEST_DEPENDS+=	${PYPKGPREFIX}-OpenSSL-[0-9]*:../../security/py-OpenSSL
 TEST_DEPENDS+=	${PYPKGPREFIX}-psutil-[0-9]*:../../sysutils/py-psutil
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 .include "../../devel/libuv/buildlink3.mk"
 .include "../../lang/python/egg.mk"
diff --git a/editors/retext/Makefile b/editors/retext/Makefile
index 9a911b47c0e..a15b42002d0 100644
--- a/editors/retext/Makefile
+++ b/editors/retext/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2021/11/25 00:38:35 gutteridge Exp $
+# $NetBSD: Makefile,v 1.9 2021/12/30 13:05:31 adam Exp $
 
 DISTNAME=	ReText-7.2.2
 PKGNAME=	${DISTNAME:tl}
@@ -16,7 +16,7 @@ DEPENDS+=	${PYPKGPREFIX}-markups-[0-9]*:../../textproc/py-markups
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36 # py-markups
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-markups
 
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../lang/python/egg.mk"
diff --git a/finance/py-alpha_vantage/Makefile b/finance/py-alpha_vantage/Makefile
index 2791e1fa278..efeda439278 100644
--- a/finance/py-alpha_vantage/Makefile
+++ b/finance/py-alpha_vantage/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2021/04/09 15:42:35 tnn Exp $
+# $NetBSD: Makefile,v 1.6 2021/12/30 13:05:31 adam Exp $
 
 DISTNAME=	alpha_vantage-2.1.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -15,7 +15,7 @@ DEPENDS+=	${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE=	36 27	# py-pandas
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-pandas
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/finance/py-alphalens/Makefile b/finance/py-alphalens/Makefile
index 76a680871b5..5b4f6eb29d0 100644
--- a/finance/py-alphalens/Makefile
+++ b/finance/py-alphalens/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2021/04/07 08:16:37 nia Exp $
+# $NetBSD: Makefile,v 1.6 2021/12/30 13:05:32 adam Exp $
 
 DISTNAME=	alphalens-0.3.6
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -20,7 +20,7 @@ DEPENDS+=	${PYPKGPREFIX}-statsmodels>=0.6.1:../../math/py-statsmodels
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE=	36 27	# py-matplotlib, py-scipy
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-matplotlib, py-scipy
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/finance/py-backtrader/Makefile b/finance/py-backtrader/Makefile
index 4a94486a226..887bf057783 100644
--- a/finance/py-backtrader/Makefile
+++ b/finance/py-backtrader/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2021/04/09 15:42:35 tnn Exp $
+# $NetBSD: Makefile,v 1.4 2021/12/30 13:05:32 adam Exp $
 
 DISTNAME=	backtrader-1.9.74.123
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -18,7 +18,7 @@ DEPENDS+=	${PYPKGPREFIX}-pandas-[0-9]*:../../math/py-pandas
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE=	36 27	# py-matplotlib, py-pandas
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-matplotlib, py-pandas
 
 post-install:
 	cd ${DESTDIR}${PREFIX}/bin && \
diff --git a/finance/py-empyrical/Makefile b/finance/py-empyrical/Makefile
index 53daa3ba5d6..b809815398e 100644
--- a/finance/py-empyrical/Makefile
+++ b/finance/py-empyrical/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2021/04/09 14:41:34 tnn Exp $
+# $NetBSD: Makefile,v 1.4 2021/12/30 13:05:32 adam Exp $
 
 DISTNAME=	empyrical-0.5.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -18,7 +18,7 @@ DEPENDS+=	${PYPKGPREFIX}-scipy>=0.15.1:../../math/py-scipy
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE=	36 27	# py-scipy
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-scipy
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/finance/py-eth-abi/Makefile b/finance/py-eth-abi/Makefile
index 02dbc8e4760..680202db20a 100644
--- a/finance/py-eth-abi/Makefile
+++ b/finance/py-eth-abi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2021/12/17 00:21:34 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2021/12/30 13:05:32 adam Exp $
 
 DISTNAME=	eth_abi-2.1.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/_/-/}
@@ -16,7 +16,7 @@ DEPENDS+=	${PYPKGPREFIX}-parsimonious>=0.8.0:../../textproc/py-parsimonious
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/finance/py-eth-account/Makefile b/finance/py-eth-account/Makefile
index 0298fece1bb..9f22aa53df5 100644
--- a/finance/py-eth-account/Makefile
+++ b/finance/py-eth-account/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2021/12/17 00:21:34 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2021/12/30 13:05:32 adam Exp $
 
 DISTNAME=	eth-account-0.5.6
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -21,7 +21,7 @@ DEPENDS+=	${PYPKGPREFIX}-rlp>=1.0.0:../../devel/py-rlp
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/finance/py-fecon235/Makefile b/finance/py-fecon235/Makefile
index 57cab547b9b..c458f1b0c15 100644
--- a/finance/py-fecon235/Makefile
+++ b/finance/py-fecon235/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2021/04/07 08:16:37 nia Exp $
+# $NetBSD: Makefile,v 1.5 2021/12/30 13:05:32 adam Exp $
 
 GITHUB_PROJECT=	fecon235
 GITHUB_TAG=	v5.17.0722
@@ -23,7 +23,7 @@ DEPENDS+=	${PYPKGPREFIX}-sympy-[0-9]*:../../math/py-sympy
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE=	36 27	# py-matplotlib, py-scipy
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-matplotlib, py-scipy
 
 NO_BUILD=		yes
 PY_PATCHPLIST=		yes
diff --git a/finance/py-pyfolio/Makefile b/finance/py-pyfolio/Makefile
index 02a6a3a47f1..a2f0c50d803 100644
--- a/finance/py-pyfolio/Makefile
+++ b/finance/py-pyfolio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2021/04/09 14:41:34 tnn Exp $
+# $NetBSD: Makefile,v 1.4 2021/12/30 13:05:32 adam Exp $
 
 DISTNAME=	pyfolio-0.9.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -26,7 +26,7 @@ TEST_DEPENDS+=	${PYPKGPREFIX}-nose>=1.3.7:../../devel/py-nose
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE=	36 27	# py-matplotlib, py-scipy
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-matplotlib, py-scipy
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/py-fonttools/Makefile b/fonts/py-fonttools/Makefile
index 3f949ef41d1..5d94b95782d 100644
--- a/fonts/py-fonttools/Makefile
+++ b/fonts/py-fonttools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.74 2021/12/19 16:47:16 adam Exp $
+# $NetBSD: Makefile,v 1.75 2021/12/30 13:05:32 adam Exp $
 
 DISTNAME=	fonttools-4.28.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -25,7 +25,7 @@ TEST_DEPENDS+=	${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
 # 3 failed, 3456 passed, 143 skipped, 2 xfailed, 23 warnings, 6 errors
 PYSETUPTESTTARGET=	pytest
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 SUBST_CLASSES+=		man
 SUBST_STAGE.man=	pre-configure
diff --git a/geography/py-gdal/Makefile b/geography/py-gdal/Makefile
index a16a43ff2be..d832a68863f 100644
--- a/geography/py-gdal/Makefile
+++ b/geography/py-gdal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2021/12/08 16:04:46 adam Exp $
+# $NetBSD: Makefile,v 1.41 2021/12/30 13:05:32 adam Exp $
 
 PKGREVISION= 1
 .include "../../geography/gdal-lib/Makefile.common"
@@ -12,7 +12,6 @@ BUILD_DIRS=	swig/python
 MAKE_FILE=	GNUmakefile
 
 PYTHON_VERSIONS_INCOMPATIBLE=	27
-PYTHON_VERSIONS_INCOMPATIBLE+=	36	# py-numpy
 
 REPLACE_PYTHON+=	swig/python/scripts/*py
 
diff --git a/geography/py-obspy/Makefile b/geography/py-obspy/Makefile
index 3054f9b864a..a493da2d28a 100644
--- a/geography/py-obspy/Makefile
+++ b/geography/py-obspy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2021/04/09 14:41:34 tnn Exp $
+# $NetBSD: Makefile,v 1.19 2021/12/30 13:05:33 adam Exp $
 
 DISTNAME=	obspy-1.2.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -24,7 +24,7 @@ USE_TOOLS+=	bash:run
 
 REPLACE_BASH=	obspy/taup/tests/data/TauP_test_data/gendata.sh
 
-PYTHON_VERSIONS_INCOMPATIBLE=	36 27	# py-scipy
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-scipy
 
 pre-configure:
 	${FIND} ${WRKSRC} -type f -exec ${CHMOD} -x {} \;
diff --git a/graphics/blender-lts/Makefile b/graphics/blender-lts/Makefile
index 08c1da7bf55..f00321e6d90 100644
--- a/graphics/blender-lts/Makefile
+++ b/graphics/blender-lts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2021/12/08 16:04:49 adam Exp $
+# $NetBSD: Makefile,v 1.14 2021/12/30 13:05:33 adam Exp $
 
 DISTNAME=	blender-2.83.5
 PKGREVISION=	12
@@ -52,7 +52,7 @@ INSTALLATION_DIRS=	bin share/blender
 
 CHECK_PORTABILITY_SKIP+=	doc/python_api/sphinx_doc_gen.sh
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 pre-configure:
 	${MKDIR} ${WRKSRC}/build
diff --git a/graphics/py-OpenGL-accelerate/Makefile b/graphics/py-OpenGL-accelerate/Makefile
index 6ea7f35af49..afeabe8ce63 100644
--- a/graphics/py-OpenGL-accelerate/Makefile
+++ b/graphics/py-OpenGL-accelerate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2021/12/17 06:58:16 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2021/12/30 13:05:33 adam Exp $
 
 DISTNAME=	PyOpenGL-accelerate-3.1.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/^Py//}
@@ -12,7 +12,7 @@ COMMENT=	Acceleration code for PyOpenGL
 # There are many similar licenses, see license.txt
 LICENSE=	modified-bsd AND mit
 
-PYTHON_VERSIONS_INCOMPATIBLE+=	27 36	# py-numpy
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-numpy
 
 .include "../../lang/python/egg.mk"
 .include "../../math/py-numpy/buildlink3.mk"
diff --git a/graphics/py-OpenGL/Makefile b/graphics/py-OpenGL/Makefile
index 07b06c33425..c0ba7e379db 100644
--- a/graphics/py-OpenGL/Makefile
+++ b/graphics/py-OpenGL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2021/12/17 06:58:16 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2021/12/30 13:05:33 adam Exp $
 
 DISTNAME=	PyOpenGL-3.1.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/^Py//}
@@ -20,7 +20,7 @@ USE_LANGUAGES=	# none
 
 REPLACE_PYTHON+=	OpenGL/arrays/buffers.py
 
-PYTHON_VERSIONS_INCOMPATIBLE+=	27 36	# py-numpy
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-numpy
 
 do-test:
 	cd ${WRKSRC} && ${PYTHONBIN} tests/test_core.py
diff --git a/graphics/py-fits/Makefile b/graphics/py-fits/Makefile
index 46d1af4a79f..7f5a5e9bbc6 100644
--- a/graphics/py-fits/Makefile
+++ b/graphics/py-fits/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2021/06/29 08:42:00 nia Exp $
+# $NetBSD: Makefile,v 1.11 2021/12/30 13:05:33 adam Exp $
 
 DISTNAME=	pyfits-3.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -14,8 +14,6 @@ LICENSE=	modified-bsd
 BUILD_DEPENDS+=	${PYPKGPREFIX}-d2to1>=0.2.12:../../devel/py-d2to1
 BUILD_DEPENDS+=	${PYPKGPREFIX}-stsci.distutils>=0.3:../../devel/py-stsci.distutils
 
-PYTHON_VERSIONS_INCOMPATIBLE+=	36	# py-numpy
-
 post-install:
 	cd ${DESTDIR}${PREFIX}/bin && \
 		${MV} fitscheck fitscheck-${PYVERSSUFFIX} && \
diff --git a/graphics/py-ggplot/Makefile b/graphics/py-ggplot/Makefile
index 8a10e7a0e12..c32dc9e72e9 100644
--- a/graphics/py-ggplot/Makefile
+++ b/graphics/py-ggplot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2021/04/07 08:16:37 nia Exp $
+# $NetBSD: Makefile,v 1.7 2021/12/30 13:05:33 adam Exp $
 
 DISTNAME=	ggplot-0.11.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -23,7 +23,7 @@ TEST_DEPENDS+=	${PYPKGPREFIX}-tornado-[0-9]*:../../www/py-tornado
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE=	36 27	# py-statsmodels py-pandas
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-statsmodels py-pandas
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/py-imageio/Makefile b/graphics/py-imageio/Makefile
index fcc325e0882..a54ec93405e 100644
--- a/graphics/py-imageio/Makefile
+++ b/graphics/py-imageio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2021/11/17 17:27:15 adam Exp $
+# $NetBSD: Makefile,v 1.8 2021/12/30 13:05:33 adam Exp $
 
 DISTNAME=	imageio-2.10.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -15,7 +15,7 @@ DEPENDS+=	${PYPKGPREFIX}-numpy-[0-9]*:../../math/py-numpy
 TEST_DEPENDS+=	${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 TEST_DEPENDS+=	${PYPKGPREFIX}-tifffile-[0-9]*:../../graphics/py-tifffile
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36 # py-numpy
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-numpy
 
 USE_LANGUAGES=	# none
 
diff --git a/graphics/py-matplotlib-venn/Makefile b/graphics/py-matplotlib-venn/Makefile
index f11979c16e6..87821c88942 100644
--- a/graphics/py-matplotlib-venn/Makefile
+++ b/graphics/py-matplotlib-venn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2021/05/10 09:29:13 adam Exp $
+# $NetBSD: Makefile,v 1.4 2021/12/30 13:05:33 adam Exp $
 
 DISTNAME=	matplotlib-venn-0.11.6
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -14,7 +14,7 @@ DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
 DEPENDS+=	${PYPKGPREFIX}-numpy-[0-9]*:../../math/py-numpy
 DEPENDS+=	${PYPKGPREFIX}-scipy-[0-9]*:../../math/py-scipy
 
-PYTHON_VERSIONS_INCOMPATIBLE=	36 27	# py-scipy
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-scipy
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/py-matplotlib/Makefile b/graphics/py-matplotlib/Makefile
index bbbb751e55f..921ed092b2d 100644
--- a/graphics/py-matplotlib/Makefile
+++ b/graphics/py-matplotlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.70 2021/11/06 11:59:28 adam Exp $
+# $NetBSD: Makefile,v 1.71 2021/12/30 13:05:34 adam Exp $
 
 DISTNAME=	matplotlib-3.4.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -24,7 +24,7 @@ USE_TOOLS+=	pkg-config
 
 PYSETUPTESTTARGET=	pytest
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36 # py-numpy
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-numpy
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
diff --git a/graphics/py-pygraphviz/Makefile b/graphics/py-pygraphviz/Makefile
index 764a2fe5b15..efb51a9abf5 100644
--- a/graphics/py-pygraphviz/Makefile
+++ b/graphics/py-pygraphviz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2021/02/05 22:06:16 adam Exp $
+# $NetBSD: Makefile,v 1.11 2021/12/30 13:05:34 adam Exp $
 
 DISTNAME=	pygraphviz-1.7
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -17,7 +17,7 @@ TEST_DEPENDS+=	${PYPKGPREFIX}-nose>=1.3.7:../../devel/py-nose
 
 USE_TOOLS+=	pkg-config
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 .include "../../graphics/graphviz/buildlink3.mk"
 .include "../../lang/python/egg.mk"
diff --git a/graphics/py-seaborn/Makefile b/graphics/py-seaborn/Makefile
index 31458ea0278..971f4634ab5 100644
--- a/graphics/py-seaborn/Makefile
+++ b/graphics/py-seaborn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2021/04/09 14:41:34 tnn Exp $
+# $NetBSD: Makefile,v 1.7 2021/12/30 13:05:34 adam Exp $
 
 DISTNAME=	seaborn-0.9.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -17,7 +17,7 @@ DEPENDS+=	${PYPKGPREFIX}-scipy>=0.14.0:../../math/py-scipy
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE=	36 27	# py-matplotlib, py-scipy
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-matplotlib, py-scipy
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/py-tifffile/Makefile b/graphics/py-tifffile/Makefile
index de1b68fb6b0..ab5c71d4f26 100644
--- a/graphics/py-tifffile/Makefile
+++ b/graphics/py-tifffile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2021/11/17 17:25:03 adam Exp $
+# $NetBSD: Makefile,v 1.10 2021/12/30 13:05:34 adam Exp $
 
 DISTNAME=	tifffile-2021.11.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -12,7 +12,7 @@ LICENSE=	modified-bsd
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 post-install:
 .for bin in lsm2bin tiff2fsspec tiffcomment tifffile
diff --git a/ham/gr-osmosdr/Makefile b/ham/gr-osmosdr/Makefile
index c2ce99035f9..d0b54a2e6b1 100644
--- a/ham/gr-osmosdr/Makefile
+++ b/ham/gr-osmosdr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2021/12/11 14:57:52 tnn Exp $
+# $NetBSD: Makefile,v 1.37 2021/12/30 13:05:35 adam Exp $
 
 DISTNAME=		gr-osmosdr-0.2.3.20210128
 PKGREVISION=		4
@@ -28,7 +28,7 @@ CMAKE_ARGS+=	-Dpybind11_DIR=${PREFIX}/${PYSITELIB}/pybind11/share/cmake/pybind11
 
 PLIST_SUBST+=	PYSITELIB=${PYSITELIB}
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 REPLACE_PYTHON+=		apps/osmocom_siggen_base.py
 
 .include "../../audio/libsndfile/buildlink3.mk"
diff --git a/math/py-Keras-Applications/Makefile b/math/py-Keras-Applications/Makefile
index 4f02a08eb52..9d5fd1e47e5 100644
--- a/math/py-Keras-Applications/Makefile
+++ b/math/py-Keras-Applications/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2021/06/07 11:59:20 adam Exp $
+# $NetBSD: Makefile,v 1.3 2021/12/30 13:05:35 adam Exp $
 
 DISTNAME=	Keras_Applications-1.0.8
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/_/-/}
@@ -15,7 +15,7 @@ DEPENDS+=	${PYPKGPREFIX}-numpy>=1.9.1:../../math/py-numpy
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36 # py-h5py
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-h5py
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/py-Keras-Preprocessing/Makefile b/math/py-Keras-Preprocessing/Makefile
index 72184a55c05..9f7155678e9 100644
--- a/math/py-Keras-Preprocessing/Makefile
+++ b/math/py-Keras-Preprocessing/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2021/06/29 08:42:00 nia Exp $
+# $NetBSD: Makefile,v 1.3 2021/12/30 13:05:35 adam Exp $
 
 DISTNAME=	Keras_Preprocessing-1.1.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/_/-/}
@@ -15,7 +15,5 @@ DEPENDS+=	${PYPKGPREFIX}-six>=1.9.0:../../lang/py-six
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE+=	36	# py-numpy
-
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/py-Theano/Makefile b/math/py-Theano/Makefile
index 772a7abcf83..b595542a395 100644
--- a/math/py-Theano/Makefile
+++ b/math/py-Theano/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2021/04/09 14:41:34 tnn Exp $
+# $NetBSD: Makefile,v 1.8 2021/12/30 13:05:35 adam Exp $
 
 DISTNAME=	Theano-1.0.4
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -26,7 +26,7 @@ REPLACE.bash.old=	.*/bin/bash
 REPLACE.bash.new=	${SH}
 REPLACE_FILES.bash=	theano/misc/check_blas_many.sh
 
-PYTHON_VERSIONS_INCOMPATIBLE=	36 27	# py-scipy
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-scipy
 
 post-install:
 	cd ${DESTDIR}${PREFIX}/bin && \
diff --git a/math/py-abcpmc/Makefile b/math/py-abcpmc/Makefile
index da9da433107..c66e64f3951 100644
--- a/math/py-abcpmc/Makefile
+++ b/math/py-abcpmc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2021/04/09 14:41:34 tnn Exp $
+# $NetBSD: Makefile,v 1.6 2021/12/30 13:05:35 adam Exp $
 
 DISTNAME=	abcpmc-0.1.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -20,7 +20,7 @@ TEST_DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE=	36 27	# py-scipy
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-scipy
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/py-arviz/Makefile b/math/py-arviz/Makefile
index 68e05ed2e90..f8a6437dbb8 100644
--- a/math/py-arviz/Makefile
+++ b/math/py-arviz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2021/04/09 14:41:35 tnn Exp $
+# $NetBSD: Makefile,v 1.6 2021/12/30 13:05:35 adam Exp $
 
 DISTNAME=	arviz-0.9.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -20,7 +20,7 @@ DEPENDS+=	${PYPKGPREFIX}-xarray>=0.11:../../math/py-xarray
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE=	36 27	# py-scipy
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-scipy
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/py-asdf/Makefile b/math/py-asdf/Makefile
index c7303613ea4..5ead62b3658 100644
--- a/math/py-asdf/Makefile
+++ b/math/py-asdf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2021/12/14 07:11:40 adam Exp $
+# $NetBSD: Makefile,v 1.5 2021/12/30 13:05:35 adam Exp $
 
 DISTNAME=	asdf-2.8.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -21,7 +21,7 @@ DEPENDS+=	${PYPKGPREFIX}-yaml>=3.10:../../textproc/py-yaml
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36	# py-numpy
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-numpy
 
 .include "../../lang/python/pyversion.mk"
 .if ${_PYTHON_VERSION} < 39
diff --git a/math/py-asteval/Makefile b/math/py-asteval/Makefile
index 38249545ae9..f71eef6d120 100644
--- a/math/py-asteval/Makefile
+++ b/math/py-asteval/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2021/11/04 13:56:13 adam Exp $
+# $NetBSD: Makefile,v 1.11 2021/12/30 13:05:35 adam Exp $
 
 DISTNAME=	asteval-0.9.25
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -15,7 +15,7 @@ DEPENDS+=	${PYPKGPREFIX}-numpy>=1.6:../../math/py-numpy
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36 # py-numpy
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-numpy
 
 do-test:
 	cd ${WRKSRC}/tests && ${PYTHONBIN} test_asteval.py
diff --git a/math/py-astroML/Makefile b/math/py-astroML/Makefile
index 79002a368ec..5c59ab577d5 100644
--- a/math/py-astroML/Makefile
+++ b/math/py-astroML/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2020/12/19 14:42:39 mef Exp $
+# $NetBSD: Makefile,v 1.2 2021/12/30 13:05:35 adam Exp $
 
 DISTNAME=	astroML-1.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -12,8 +12,7 @@ HOMEPAGE=	https://www.astroml.org/
 COMMENT=	Astropy affiliated module for machine learning and data mining
 LICENSE=	modified-bsd
 
-PYTHON_VERSIONS_INCOMPATIBLE+=	27
-PYTHON_VERSIONS_INCOMPATIBLE+=	36
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 DEPENDS+=	${PYPKGPREFIX}-matplotlib>=2.1.1:../../graphics/py-matplotlib
 DEPENDS+=	${PYPKGPREFIX}-scikit-learn>=0.18:../../math/py-scikit-learn
diff --git a/math/py-astroplan/Makefile b/math/py-astroplan/Makefile
index c35cc0c5ec6..8687bb7e134 100644
--- a/math/py-astroplan/Makefile
+++ b/math/py-astroplan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2020/12/19 14:38:01 mef Exp $
+# $NetBSD: Makefile,v 1.2 2021/12/30 13:05:36 adam Exp $
 
 DISTNAME=	astroplan-0.7
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -12,8 +12,7 @@ HOMEPAGE=	https://astroplan.readthedocs.io/en/latest/
 COMMENT=	Astropy affiliated module for planning astronomical observations
 LICENSE=	modified-bsd
 
-PYTHON_VERSIONS_INCOMPATIBLE+=	27
-PYTHON_VERSIONS_INCOMPATIBLE+=	36
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 DEPENDS+=	${PYPKGPREFIX}-matplotlib>=3.0:../../graphics/py-matplotlib
 DEPENDS+=	${PYPKGPREFIX}-pytz>=2020.4:../../time/py-pytz
diff --git a/math/py-astropy/Makefile b/math/py-astropy/Makefile
index 8ae4c7647bb..f055ad5a48f 100644
--- a/math/py-astropy/Makefile
+++ b/math/py-astropy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2020/12/19 14:17:39 mef Exp $
+# $NetBSD: Makefile,v 1.2 2021/12/30 13:05:36 adam Exp $
 
 DISTNAME=	astropy-4.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -10,8 +10,7 @@ HOMEPAGE=	https://www.astropy.org/
 COMMENT=	Python module for astronomical calculations and data analysis
 LICENSE=	modified-bsd
 
-PYTHON_VERSIONS_INCOMPATIBLE+=	27
-PYTHON_VERSIONS_INCOMPATIBLE+=	36
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 DEPENDS+=	libxml2>=2.9.10:../../textproc/libxml2
 DEPENDS+=	${PYPKGPREFIX}-numpy>=1.17.0:../../math/py-numpy
diff --git a/math/py-astroquery/Makefile b/math/py-astroquery/Makefile
index f5cd0877241..b24fcb6d700 100644
--- a/math/py-astroquery/Makefile
+++ b/math/py-astroquery/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2020/12/22 22:03:56 mef Exp $
+# $NetBSD: Makefile,v 1.3 2021/12/30 13:05:36 adam Exp $
 
 DISTNAME=	astroquery-0.3.9
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -12,8 +12,7 @@ HOMEPAGE=	https://astroquery.readthedocs.io/en/latest/
 COMMENT=	Astropy coordinated Python module for querying astronomical databases
 LICENSE=	modified-bsd
 
-PYTHON_VERSIONS_INCOMPATIBLE+=	27
-PYTHON_VERSIONS_INCOMPATIBLE+=	36
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 DEPENDS+=	${PYPKGPREFIX}-requests>=2.25.0:../../devel/py-requests
 DEPENDS+=	${PYPKGPREFIX}-keyring>=21.2.1:../../security/py-keyring
diff --git a/math/py-autograd/Makefile b/math/py-autograd/Makefile
index 70fe015faae..16eb93e6788 100644
--- a/math/py-autograd/Makefile
+++ b/math/py-autograd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2021/06/29 08:42:00 nia Exp $
+# $NetBSD: Makefile,v 1.6 2021/12/30 13:05:36 adam Exp $
 
 DISTNAME=	autograd-1.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -15,8 +15,6 @@ DEPENDS+=	${PYPKGPREFIX}-future>=0.15.2:../../devel/py-future
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE+=	36	# py-numpy
-
 .include "../../lang/python/egg.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/py-bottleneck/Makefile b/math/py-bottleneck/Makefile
index 54883745248..308b33f2865 100644
--- a/math/py-bottleneck/Makefile
+++ b/math/py-bottleneck/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2021/06/29 08:42:01 nia Exp $
+# $NetBSD: Makefile,v 1.6 2021/12/30 13:05:36 adam Exp $
 
 DISTNAME=	Bottleneck-1.3.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
@@ -15,8 +15,6 @@ TEST_DEPENDS+=	${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
 
 PYSETUPTESTTARGET=	pytest
 
-PYTHON_VERSIONS_INCOMPATIBLE+=	36	# py-numpy
-
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/py-gwcs/Makefile b/math/py-gwcs/Makefile
index e1a9f761298..ab3f89514b3 100644
--- a/math/py-gwcs/Makefile
+++ b/math/py-gwcs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2020/12/19 14:54:00 mef Exp $
+# $NetBSD: Makefile,v 1.2 2021/12/30 13:05:36 adam Exp $
 
 DISTNAME=	gwcs-0.15.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -10,8 +10,7 @@ HOMEPAGE=	https://gwcs.readthedocs.io/en/latest/
 COMMENT=	Generalized World Coordinate System
 LICENSE=	modified-bsd
 
-PYTHON_VERSIONS_INCOMPATIBLE+=	27
-PYTHON_VERSIONS_INCOMPATIBLE+=	36
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 DEPENDS+=	${PYPKGPREFIX}-scipy>=1.1:../../math/py-scipy
 DEPENDS+=	${PYPKGPREFIX}-astropy>=4.2:../../math/py-astropy
diff --git a/math/py-jplephem/Makefile b/math/py-jplephem/Makefile
index 8b0f540c37b..4aff7d1478d 100644
--- a/math/py-jplephem/Makefile
+++ b/math/py-jplephem/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2021/11/18 19:43:11 adam Exp $
+# $NetBSD: Makefile,v 1.3 2021/12/30 13:05:36 adam Exp $
 
 DISTNAME=	jplephem-2.16
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -14,7 +14,7 @@ DEPENDS+=	${PYPKGPREFIX}-numpy>=1.17.0:../../math/py-numpy
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../lang/python/distutils.mk"
diff --git a/math/py-lmfit/Makefile b/math/py-lmfit/Makefile
index 88d3def516e..3719026daed 100644
--- a/math/py-lmfit/Makefile
+++ b/math/py-lmfit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2021/12/17 07:49:34 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2021/12/30 13:05:36 adam Exp $
 
 DISTNAME=	lmfit-1.0.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -19,7 +19,7 @@ TEST_DEPENDS+=	${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36	# py-scipy
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-scipy
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/py-netCDF4/Makefile b/math/py-netCDF4/Makefile
index 8b993f5a19f..14bd151f28e 100644
--- a/math/py-netCDF4/Makefile
+++ b/math/py-netCDF4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2021/12/16 09:53:28 adam Exp $
+# $NetBSD: Makefile,v 1.17 2021/12/30 13:05:36 adam Exp $
 
 DISTNAME=	netCDF4-1.5.8
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -20,7 +20,7 @@ SUBST_SED.paths+=	-e 's,/usr/local,${PREFIX},g'
 SUBST_FILES.paths+=	setup.py
 SUBST_MESSAGE.paths=	Fixing header search paths.
 
-PYTHON_VERSIONS_INCOMPATIBLE+=	27 36	# py-numpy
+PYTHON_VERSIONS_INCOMPATIBLE+=	27 # py-numpy
 
 do-test:
 	cd ${WRKSRC}/test && ${SETENV} ${TEST_ENV} ${PYTHONBIN} run_all.py
diff --git a/math/py-numba/Makefile b/math/py-numba/Makefile
index c5d4b3a34ce..a65d41c4778 100644
--- a/math/py-numba/Makefile
+++ b/math/py-numba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2021/06/29 08:42:01 nia Exp $
+# $NetBSD: Makefile,v 1.25 2021/12/30 13:05:37 adam Exp $
 
 DISTNAME=	numba-0.51.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -17,7 +17,6 @@ DEPENDS+=	${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
 USE_LANGUAGES=	c c++
 
 PYTHON_VERSIONS_INCOMPATIBLE=	27
-PYTHON_VERSIONS_INCOMPATIBLE+=	36	# py-numpy
 
 post-install:
 .for cmd in numba pycc
diff --git a/math/py-numexpr/Makefile b/math/py-numexpr/Makefile
index cb8d71ed66a..3352f38e4e9 100644
--- a/math/py-numexpr/Makefile
+++ b/math/py-numexpr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2021/12/19 14:00:47 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2021/12/30 13:05:37 adam Exp $
 
 DISTNAME=	numexpr-2.7.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -13,7 +13,7 @@ LICENSE=	mit
 USE_LANGUAGES=	c c++
 REPLACE_PYTHON=	numexpr/cpuinfo.py
 
-PYTHON_VERSIONS_INCOMPATIBLE+=	27 36	# py-numpy
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-numpy
 
 do-test:
 	${PYTHONBIN} -c "import numexpr; numexpr.test()"
diff --git a/math/py-numpy/Makefile b/math/py-numpy/Makefile
index 6c984f62f92..e8f8ed5104d 100644
--- a/math/py-numpy/Makefile
+++ b/math/py-numpy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.86 2021/12/20 11:27:57 adam Exp $
+# $NetBSD: Makefile,v 1.87 2021/12/30 13:05:37 adam Exp $
 
 DISTNAME=	numpy-1.21.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -22,7 +22,7 @@ USE_LANGUAGES=		c99 c++ fortran
 
 REPLACE_PYTHON+=	*.py */*.py */*/*.py */*/*/*.py */*/*/*/*.py
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 # XXX Avoid picking up other compilers when installed
 .include "../../mk/compiler.mk"
diff --git a/math/py-numpy/buildlink3.mk b/math/py-numpy/buildlink3.mk
index 18cbf85be3e..057a3c51bf5 100644
--- a/math/py-numpy/buildlink3.mk
+++ b/math/py-numpy/buildlink3.mk
@@ -1,12 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.11 2021/07/01 06:13:45 nia Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2021/12/30 13:05:37 adam Exp $
 
 BUILDLINK_TREE+=	py-numpy
 
 .if !defined(PY_NUMPY_BUILDLINK3_MK)
 PY_NUMPY_BUILDLINK3_MK:=
 
-PYTHON_VERSIONS_INCOMPATIBLE+=		36
-
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.py-numpy+=	${PYPKGPREFIX}-numpy>=1.0
diff --git a/math/py-pandas-datareader/Makefile b/math/py-pandas-datareader/Makefile
index 5f8d891032e..06f155235e4 100644
--- a/math/py-pandas-datareader/Makefile
+++ b/math/py-pandas-datareader/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2021/04/09 15:42:35 tnn Exp $
+# $NetBSD: Makefile,v 1.12 2021/12/30 13:05:37 adam Exp $
 
 DISTNAME=	pandas-datareader-0.8.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -15,7 +15,7 @@ DEPENDS+=	${PYPKGPREFIX}-lxml-[0-9]*:../../textproc/py-lxml
 DEPENDS+=	${PYPKGPREFIX}-pandas>=0.21:../../math/py-pandas
 DEPENDS+=	${PYPKGPREFIX}-requests>=2.3.0:../../devel/py-requests
 
-PYTHON_VERSIONS_INCOMPATIBLE=	36 27      # py-pandas
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-pandas
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/py-pandas/Makefile b/math/py-pandas/Makefile
index 9751a372507..80e4eefbbde 100644
--- a/math/py-pandas/Makefile
+++ b/math/py-pandas/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2021/12/12 20:30:49 adam Exp $
+# $NetBSD: Makefile,v 1.36 2021/12/30 13:05:37 adam Exp $
 
 DISTNAME=	pandas-1.3.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -27,7 +27,7 @@ USE_LANGUAGES=	c c++
 
 PYSETUPTESTTARGET=	pytest
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 .include "../../lang/python/egg.mk"
 BUILDLINK_API_DEPENDS.pynumpy+= ${PYPKGPREFIX}-numpy>=1.16.5
diff --git a/math/py-patsy/Makefile b/math/py-patsy/Makefile
index 9ddcc0320fb..b326b1180d1 100644
--- a/math/py-patsy/Makefile
+++ b/math/py-patsy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2021/11/14 20:40:44 adam Exp $
+# $NetBSD: Makefile,v 1.8 2021/12/30 13:05:37 adam Exp $
 
 DISTNAME=	patsy-0.5.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -15,8 +15,6 @@ TEST_DEPENDS+=	${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE+=	36	# py-numpy
-
 .include "../../lang/python/egg.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/py-photutils/Makefile b/math/py-photutils/Makefile
index 3e0dd935073..71937cb295f 100644
--- a/math/py-photutils/Makefile
+++ b/math/py-photutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2020/12/19 14:56:04 mef Exp $
+# $NetBSD: Makefile,v 1.2 2021/12/30 13:05:37 adam Exp $
 
 DISTNAME=	photutils-1.0.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -10,8 +10,7 @@ HOMEPAGE=	https://photutils.readthedocs.io/en/stable/
 COMMENT=	Astropy coordinated module for astronomical photometry
 LICENSE=	modified-bsd
 
-PYTHON_VERSIONS_INCOMPATIBLE+=	27
-PYTHON_VERSIONS_INCOMPATIBLE+=	36
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 DEPENDS+=	${PYPKGPREFIX}-scikit-image>=0.14.2:../../math/py-scikit-image
 DEPENDS+=	${PYPKGPREFIX}-scikit-learn>=0.19:../../math/py-scikit-learn
diff --git a/math/py-powerlaw/Makefile b/math/py-powerlaw/Makefile
index d4ef3a5e68d..36daac6ca63 100644
--- a/math/py-powerlaw/Makefile
+++ b/math/py-powerlaw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2021/04/09 14:41:35 tnn Exp $
+# $NetBSD: Makefile,v 1.6 2021/12/30 13:05:37 adam Exp $
 
 DISTNAME=	powerlaw-1.4.6
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -17,7 +17,7 @@ DEPENDS+=	${PYPKGPREFIX}-scipy-[0-9]*:../../math/py-scipy
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE=	36 27	# py-matplotlib, py-scipy
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-matplotlib, py-scipy
 
 .include "../../devel/py-cython/buildlink3.mk"
 .include "../../lang/python/egg.mk"
diff --git a/math/py-pyerfa/Makefile b/math/py-pyerfa/Makefile
index b1f4fae931c..e52f738b4d7 100644
--- a/math/py-pyerfa/Makefile
+++ b/math/py-pyerfa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2020/12/19 14:26:57 mef Exp $
+# $NetBSD: Makefile,v 1.2 2021/12/30 13:05:38 adam Exp $
 
 DISTNAME=	pyerfa-1.7.1.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -15,8 +15,7 @@ MAKE_ENV+=	PYERFA_USE_SYSTEM_LIBERFA=1
 USE_LIBTOOL=	yes
 USE_LANGUAGES=	c
 
-PYTHON_VERSIONS_INCOMPATIBLE+=	27
-PYTHON_VERSIONS_INCOMPATIBLE+=	36
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 DEPENDS+=	${PYPKGPREFIX}-numpy>=1.17.0:../../math/py-numpy
 DEPENDS+=	${PYPKGPREFIX}-jinja2>=2.10.3:../../textproc/py-jinja2
diff --git a/math/py-pymc3/Makefile b/math/py-pymc3/Makefile
index 245cf44d14b..5cdfefaee78 100644
--- a/math/py-pymc3/Makefile
+++ b/math/py-pymc3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2021/04/09 14:41:35 tnn Exp $
+# $NetBSD: Makefile,v 1.5 2021/12/30 13:05:38 adam Exp $
 
 DISTNAME=	pymc3-3.7
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -19,7 +19,7 @@ DEPENDS+=	${PYPKGPREFIX}-patsy>=0.4.0:../../math/py-patsy
 DEPENDS+=	${PYPKGPREFIX}-scipy>=0.18.1:../../math/py-scipy
 DEPENDS+=	${PYPKGPREFIX}-tqdm>=4.8.4:../../misc/py-tqdm
 
-PYTHON_VERSIONS_INCOMPATIBLE=	36 27	# py-matplotlib, py-scipy
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-matplotlib, py-scipy
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/py-pythran/Makefile b/math/py-pythran/Makefile
index 66c7fe5ecd9..7c6eb5b5f82 100644
--- a/math/py-pythran/Makefile
+++ b/math/py-pythran/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2021/10/02 06:52:11 adam Exp $
+# $NetBSD: Makefile,v 1.3 2021/12/30 13:05:38 adam Exp $
 
 DISTNAME=	pythran-0.10.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -17,7 +17,7 @@ DEPENDS+=	${PYPKGPREFIX}-ply>=3.4:../../devel/py-ply
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 post-install:
 .for bin in pythran pythran-config
diff --git a/math/py-pyvo/Makefile b/math/py-pyvo/Makefile
index 9bcd8625dbe..b9fb328e064 100644
--- a/math/py-pyvo/Makefile
+++ b/math/py-pyvo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2021/06/21 10:08:39 nia Exp $
+# $NetBSD: Makefile,v 1.4 2021/12/30 13:05:38 adam Exp $
 
 DISTNAME=	pyvo-1.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -12,8 +12,7 @@ LICENSE=	modified-bsd
 
 BROKEN+=	"Dependency missing from pkgsrc: astropy-helpers"
 
-PYTHON_VERSIONS_INCOMPATIBLE+=	27
-PYTHON_VERSIONS_INCOMPATIBLE+=	36
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 DEPENDS+=	${PYPKGPREFIX}-numpy-[0-9]*:../../math/py-numpy
 DEPENDS+=	${PYPKGPREFIX}-requests>=2.25.0:../../devel/py-requests
diff --git a/math/py-pywavelets/Makefile b/math/py-pywavelets/Makefile
index 502923405ad..cfe7f507440 100644
--- a/math/py-pywavelets/Makefile
+++ b/math/py-pywavelets/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2021/06/29 08:42:01 nia Exp $
+# $NetBSD: Makefile,v 1.5 2021/12/30 13:05:38 adam Exp $
 
 DISTNAME=	PyWavelets-1.0.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
@@ -16,8 +16,6 @@ REPLACE_PYTHON+=	pywt/tests/*.py
 do-test:
 	${PYTHONBIN} -c 'import pywt; pywt.test()'
 
-PYTHON_VERSIONS_INCOMPATIBLE+=	36	# py-numpy
-
 .include "../../devel/py-cython/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
diff --git a/math/py-rpy/Makefile b/math/py-rpy/Makefile
index f7e96b2db7a..7f01477a859 100644
--- a/math/py-rpy/Makefile
+++ b/math/py-rpy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2021/12/17 10:15:20 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2021/12/30 13:05:38 adam Exp $
 
 DISTNAME=	rpy2-3.4.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/rpy2/rpy/}
@@ -33,7 +33,6 @@ LDFLAGS.SunOS+=		-mimpure-text
 REPLACE_PYTHON=		rpy/tests.py
 
 PYTHON_VERSIONS_INCOMPATIBLE=	27
-PYTHON_VERSIONS_INCOMPATIBLE+=	36	# py-numpy
 
 .include "../../devel/pcre2/buildlink3.mk"
 .include "../../lang/python/application.mk"
diff --git a/math/py-scikit-image/Makefile b/math/py-scikit-image/Makefile
index 35ca69ecfba..8a47c15baa7 100644
--- a/math/py-scikit-image/Makefile
+++ b/math/py-scikit-image/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2021/03/05 04:16:57 gutteridge Exp $
+# $NetBSD: Makefile,v 1.11 2021/12/30 13:05:38 adam Exp $
 
 DISTNAME=	scikit-image-0.18.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -23,7 +23,7 @@ DEPENDS+=	${PYPKGPREFIX}-six>=1.9.0:../../lang/py-six
 
 USE_LANGUAGES=	c c++
 
-PYTHON_VERSIONS_INCOMPATIBLE+=	27 36 # py-tifffile
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-tifffile
 
 post-install:
 	cd ${DESTDIR}${PREFIX}/bin && \
diff --git a/math/py-scikit-learn/Makefile b/math/py-scikit-learn/Makefile
index 66efdfa7e98..18e2ae922a6 100644
--- a/math/py-scikit-learn/Makefile
+++ b/math/py-scikit-learn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2021/05/31 07:03:31 thor Exp $
+# $NetBSD: Makefile,v 1.16 2021/12/30 13:05:38 adam Exp $
 
 DISTNAME=	scikit-learn-0.22.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -17,7 +17,7 @@ TEST_DEPENDS+=	${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
 
 USE_LANGUAGES=	c c++ fortran
 
-PYTHON_VERSIONS_INCOMPATIBLE=	36 27	# py-scipy
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-scipy
 
 .include "../../devel/py-cython/buildlink3.mk"
 .include "../../lang/python/egg.mk"
diff --git a/math/py-scipy/Makefile b/math/py-scipy/Makefile
index 5d9b9df0ef2..c73798da6e9 100644
--- a/math/py-scipy/Makefile
+++ b/math/py-scipy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2021/11/30 17:00:44 adam Exp $
+# $NetBSD: Makefile,v 1.53 2021/12/30 13:05:39 adam Exp $
 
 DISTNAME=	scipy-1.7.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -32,7 +32,7 @@ FFLAGS+=	-fPIC
 
 LDFLAGS.Darwin+=	-headerpad_max_install_names
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 REPLACE_PYTHON+=	scipy/sparse/linalg/isolve/tests/test_gcrotmk.py
 
diff --git a/math/py-sklearn-pandas/Makefile b/math/py-sklearn-pandas/Makefile
index d23871172d5..d1645dbde2b 100644
--- a/math/py-sklearn-pandas/Makefile
+++ b/math/py-sklearn-pandas/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2021/04/09 15:42:35 tnn Exp $
+# $NetBSD: Makefile,v 1.3 2021/12/30 13:05:39 adam Exp $
 
 DISTNAME=	sklearn-pandas-1.8.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=	math
+CATEGORIES=	math python
 MASTER_SITES=	${MASTER_SITE_PYPI:=s/sklearn-pandas/}
 
 MAINTAINER=	minskim@NetBSD.org
@@ -14,7 +14,7 @@ DEPENDS+=	${PYPKGPREFIX}-numpy-[0-9]*:../../math/py-numpy
 DEPENDS+=	${PYPKGPREFIX}-pandas-[0-9]*:../../math/py-pandas
 DEPENDS+=	${PYPKGPREFIX}-scikit-learn>=0.17:../../math/py-scikit-learn
 
-PYTHON_VERSIONS_INCOMPATIBLE=	36 27	# py-scikit-learn
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-scikit-learn
 
 USE_LANGUAGES=	# none
 
diff --git a/math/py-statsmodels/Makefile b/math/py-statsmodels/Makefile
index f019ed3b1ee..352f4e35163 100644
--- a/math/py-statsmodels/Makefile
+++ b/math/py-statsmodels/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2021/04/06 12:16:47 prlw1 Exp $
+# $NetBSD: Makefile,v 1.10 2021/12/30 13:05:39 adam Exp $
 
 DISTNAME=	statsmodels-0.12.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -10,7 +10,7 @@ HOMEPAGE=	https://www.statsmodels.org/
 COMMENT=	Statistical computations and models for Python
 LICENSE=	modified-bsd
 
-PYTHON_VERSIONS_INCOMPATIBLE=	36 27	# py-scipy
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-scipy
 USE_LANGUAGES=			c
 
 BUILD_DEPENDS+=	${PYPKGPREFIX}-cython>=0.29:../../devel/py-cython
diff --git a/math/py-tables/Makefile b/math/py-tables/Makefile
index 753e487b469..844e358fd7b 100644
--- a/math/py-tables/Makefile
+++ b/math/py-tables/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2021/06/29 08:42:01 nia Exp $
+# $NetBSD: Makefile,v 1.9 2021/12/30 13:05:39 adam Exp $
 
 DISTNAME=	tables-3.6.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -24,7 +24,6 @@ DEPENDS+=	${PYPKGPREFIX}-six>=1.9.0:../../lang/py-six
 USE_LANGUAGES=	c c++
 
 PYTHON_VERSIONS_INCOMPATIBLE=	27
-PYTHON_VERSIONS_INCOMPATIBLE+=	36	# py-numpy
 
 post-install:
 	cd ${DESTDIR}${PREFIX}/bin && \
diff --git a/math/py-tensorboard/Makefile b/math/py-tensorboard/Makefile
index cb5180d7150..a333785247d 100644
--- a/math/py-tensorboard/Makefile
+++ b/math/py-tensorboard/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2021/10/01 14:25:32 nia Exp $
+# $NetBSD: Makefile,v 1.4 2021/12/30 13:05:39 adam Exp $
 
 DISTNAME=	tensorboard-${GITHUB_TAG:S/-//}
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -22,9 +22,7 @@ DEPENDS+=	${PYPKGPREFIX}-werkzeug>=0.11.10:../../www/py-werkzeug
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE+=	27 36	# py-protobuf, py-numpy
-
-.include "../../lang/python/egg.mk"
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-protobuf, py-numpy
 
 post-extract:
 .for f in MANIFEST.in setup.cfg setup.py
@@ -34,4 +32,5 @@ post-extract:
 post-install:
 	cd ${DESTDIR}${PREFIX}/bin && ${MV} tensorboard tensorboard${PYVERSSUFFIX}
 
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/py-uncertainties/Makefile b/math/py-uncertainties/Makefile
index a8d89dde93a..a99f07f3302 100644
--- a/math/py-uncertainties/Makefile
+++ b/math/py-uncertainties/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2021/08/05 10:14:30 adam Exp $
+# $NetBSD: Makefile,v 1.10 2021/12/30 13:05:39 adam Exp $
 
 DISTNAME=	uncertainties-3.1.6
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -14,7 +14,7 @@ DEPENDS+=	${PYPKGPREFIX}-future-[0-9]*:../../devel/py-future
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36	# py-numpy
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-numpy
 
 .include "../../lang/python/egg.mk"
 .include "../../math/py-numpy/buildlink3.mk"
diff --git a/math/py-xarray/Makefile b/math/py-xarray/Makefile
index c4acf6beebe..09e7f6b7444 100644
--- a/math/py-xarray/Makefile
+++ b/math/py-xarray/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2021/12/11 21:57:35 adam Exp $
+# $NetBSD: Makefile,v 1.11 2021/12/30 13:05:39 adam Exp $
 
 DISTNAME=	xarray-0.20.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -19,7 +19,7 @@ USE_LANGUAGES=	# none
 
 PYSETUPTESTTARGET=	pytest
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36	# py-pandas
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-pandas
 
 .include "../../lang/python/pyversion.mk"
 .if ${_PYTHON_VERSION} < 38
diff --git a/misc/todoman/Makefile b/misc/todoman/Makefile
index ac7a590caa3..d204447814e 100644
--- a/misc/todoman/Makefile
+++ b/misc/todoman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2021/05/23 11:08:39 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2021/12/30 13:05:39 adam Exp $
 
 DISTNAME=		todoman-4.0.0
 CATEGORIES=		misc
@@ -34,7 +34,7 @@ BUILD_DEPENDS+=	${PYPKGPREFIX}-hypothesis-[0-9]*:../../devel/py-hypothesis
 BUILD_DEPENDS+=	${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 BUILD_DEPENDS+=	${PYPKGPREFIX}-test-cov-[0-9]*:../../devel/py-test-cov
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36 37
+PYTHON_VERSIONS_INCOMPATIBLE=	27 37
 REPLACE_PYTHON+=		bin/todo
 USE_LANGUAGES=			# none
 
diff --git a/multimedia/sickgear/Makefile b/multimedia/sickgear/Makefile
index 2f881c99ba6..3431bd0f7bb 100644
--- a/multimedia/sickgear/Makefile
+++ b/multimedia/sickgear/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2021/07/25 18:02:50 js Exp $
+# $NetBSD: Makefile,v 1.11 2021/12/30 13:05:39 adam Exp $
 
 DISTNAME=	release_${PKGVERSION_NOREV}
 PKGNAME=	sickgear-0.23.14
@@ -18,7 +18,7 @@ DEPENDS+=	${PYPKGPREFIX}-cheetah-[0-9]*:../../devel/py-cheetah3
 DEPENDS+=	${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
 
 USE_TOOLS+=			pax
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36  # 36 untested
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 REPLACE_PYTHON+=	sickgear.py
 REPLACE_PYTHON+=	SickBeard.py
diff --git a/multimedia/streamlink/Makefile b/multimedia/streamlink/Makefile
index cb28e466caa..267cfee6da0 100644
--- a/multimedia/streamlink/Makefile
+++ b/multimedia/streamlink/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2021/12/16 13:44:02 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2021/12/30 13:05:40 adam Exp $
 
 DISTNAME=	streamlink-2.3.0
 CATEGORIES=	multimedia
@@ -11,7 +11,7 @@ HOMEPAGE=	https://streamlink.github.io/
 COMMENT=	Tool that pipes video streams into a video player
 LICENSE=	2-clause-bsd
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36 # py-iso3166
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-iso3166
 
 .include "../../lang/python/egg.mk"
 
diff --git a/net/mitmproxy/Makefile b/net/mitmproxy/Makefile
index 85cfcb23096..eb279e38667 100644
--- a/net/mitmproxy/Makefile
+++ b/net/mitmproxy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2021/09/16 11:52:19 leot Exp $
+# $NetBSD: Makefile,v 1.37 2021/12/30 13:05:40 adam Exp $
 
 DISTNAME=	mitmproxy-7.0.3
 CATEGORIES=	net
@@ -48,7 +48,7 @@ REPLACE_SH+=	mitmproxy/contrib/kaitaistruct/make.sh
 USE_LANGUAGES=			# none
 
 # Only for Python >=3.8
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36 37
+PYTHON_VERSIONS_INCOMPATIBLE=	27 37
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/distutils.mk"
diff --git a/net/py-aiorpcX/Makefile b/net/py-aiorpcX/Makefile
index 2a0e75fcb19..48a7a74c926 100644
--- a/net/py-aiorpcX/Makefile
+++ b/net/py-aiorpcX/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2021/11/23 21:07:18 adam Exp $
+# $NetBSD: Makefile,v 1.5 2021/12/30 13:05:40 adam Exp $
 
 DISTNAME=	aiorpcX-0.22.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -14,7 +14,7 @@ DEPENDS+=	${PYPKGPREFIX}-websockets-[0-9]*:../../www/py-websockets
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/py-xmm7360/Makefile b/net/py-xmm7360/Makefile
index a84318471f7..5fd9587f0fe 100644
--- a/net/py-xmm7360/Makefile
+++ b/net/py-xmm7360/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2020/12/30 12:32:41 nia Exp $
+# $NetBSD: Makefile,v 1.3 2021/12/30 13:05:40 adam Exp $
 
 DISTNAME=	xmm7360-0.20200727
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -21,7 +21,7 @@ DEPENDS+=	${PYPKGPREFIX}-configargparse>=1.2.3:../../devel/py-configargparse
 NO_BUILD=       yes
 XMM_DIR=	${PYSITELIB}/xmm7360
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 REPLACE_PYTHON=                 rpc/open_xdatachannel.py rpc/rpc.py
 INSTALLATION_DIRS+=             bin ${XMM_DIR}
 PY_PATCHPLIST=                  yes
diff --git a/print/py-weasyprint/Makefile b/print/py-weasyprint/Makefile
index 606e9d1782f..d03c6fd8f1d 100644
--- a/print/py-weasyprint/Makefile
+++ b/print/py-weasyprint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2021/11/20 23:29:37 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2021/12/30 13:05:40 adam Exp $
 
 DISTNAME=	weasyprint-53.4
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -27,7 +27,7 @@ TEST_DEPENDS+=	${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36 # py-fonttools
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-fonttools
 
 post-install:
 	cd ${DESTDIR}${PREFIX}/bin && \
diff --git a/textproc/py-markups/Makefile b/textproc/py-markups/Makefile
index cb1b0062b42..a24362a9a57 100644
--- a/textproc/py-markups/Makefile
+++ b/textproc/py-markups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2021/11/28 20:22:32 adam Exp $
+# $NetBSD: Makefile,v 1.8 2021/12/30 13:05:40 adam Exp $
 
 DISTNAME=	Markups-3.1.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
@@ -17,7 +17,7 @@ DEPENDS+=	${PYPKGPREFIX}-textile-[0-9]*:../../textproc/py-textile
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE+=	27 36
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 .include "../../lang/python/pyversion.mk"
 .if ${_PYTHON_VERSION} < 38
diff --git a/textproc/py-precis-i18n/Makefile b/textproc/py-precis-i18n/Makefile
index 7d1dc06d30e..614062bfadb 100644
--- a/textproc/py-precis-i18n/Makefile
+++ b/textproc/py-precis-i18n/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2021/02/22 10:27:03 adam Exp $
+# $NetBSD: Makefile,v 1.6 2021/12/30 13:05:40 adam Exp $
 
 DISTNAME=	precis_i18n-1.0.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/_/-/}
@@ -12,7 +12,7 @@ LICENSE=	mit
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/py-xml2rfc/Makefile b/textproc/py-xml2rfc/Makefile
index 2bbdcc2d239..4f831030b79 100644
--- a/textproc/py-xml2rfc/Makefile
+++ b/textproc/py-xml2rfc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2021/11/20 23:29:37 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2021/12/30 13:05:40 adam Exp $
 
 DISTNAME=	xml2rfc-3.5.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -10,7 +10,7 @@ HOMEPAGE=	https://tools.ietf.org/tools/xml2rfc/trac/
 COMMENT=	IETF RFC 7749 XML-to-RFC conversion too
 LICENSE=	modified-bsd
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36 # py-fonttools via py-weasyprint
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-fonttools via py-weasyprint
 
 DEPENDS+=	${PYPKGPREFIX}-appdirs>=1.4.4:../../devel/py-appdirs
 DEPENDS+=	${PYPKGPREFIX}-configargparse>=1.2.3:../../devel/py-configargparse
diff --git a/time/py-cftime/Makefile b/time/py-cftime/Makefile
index 297e9ca4d10..00fb4c35bdc 100644
--- a/time/py-cftime/Makefile
+++ b/time/py-cftime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2021/12/06 15:38:18 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2021/12/30 13:05:40 adam Exp $
 
 DISTNAME=	cftime-1.5.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -13,7 +13,7 @@ LICENSE=	gnu-gpl-v3
 TEST_DEPENDS+=	${PYPKGPREFIX}-test-cov-[0-9]*:../../devel/py-test-cov
 TEST_DEPENDS+=	${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36 # py-numpy
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-numpy
 
 TEST_ENV+=	PYTHONPATH=build/lib
 do-test:
diff --git a/time/py-trading-calendars/Makefile b/time/py-trading-calendars/Makefile
index 523a8614fa3..b595d06cf1d 100644
--- a/time/py-trading-calendars/Makefile
+++ b/time/py-trading-calendars/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2021/04/09 15:42:35 tnn Exp $
+# $NetBSD: Makefile,v 1.3 2021/12/30 13:05:41 adam Exp $
 
 DISTNAME=	trading_calendars-1.11.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/_/-/}
@@ -18,7 +18,7 @@ DEPENDS+=	${PYPKGPREFIX}-toolz-[0-9]*:../../devel/py-toolz
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE=	36 27	# py-pandas
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-pandas
 
 post-install:
 	${MV} ${DESTDIR}${PREFIX}/bin/tcal \
diff --git a/time/py-vdirsyncer/Makefile b/time/py-vdirsyncer/Makefile
index 2a1df33e3ca..b1be537a02a 100644
--- a/time/py-vdirsyncer/Makefile
+++ b/time/py-vdirsyncer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2021/06/13 17:56:15 adam Exp $
+# $NetBSD: Makefile,v 1.59 2021/12/30 13:05:41 adam Exp $
 
 DISTNAME=	vdirsyncer-0.18.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -34,7 +34,7 @@ PLIST_SUBST+=		PKGBASE=${PKGBASE}
 PYTHON_SELF_CONFLICT=	yes
 PYSETUPTESTTARGET=	pytest
 
-PYTHON_VERSIONS_INCOMPATIBLE+=	27 36
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 USE_TOOLS+=	gmake
 
diff --git a/www/py-httpcore/Makefile b/www/py-httpcore/Makefile
index 2ca55a8cdd5..f9fcf47cd03 100644
--- a/www/py-httpcore/Makefile
+++ b/www/py-httpcore/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2021/11/17 17:06:06 adam Exp $
+# $NetBSD: Makefile,v 1.12 2021/12/30 13:05:41 adam Exp $
 
 DISTNAME=	httpcore-0.14.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -18,7 +18,7 @@ DEPENDS+=	${PYPKGPREFIX}-sniffio>=1.0.0:../../misc/py-sniffio
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36 # py-anyio, py-uvloop
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-anyio, py-uvloop
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/py-httpx-socks/Makefile b/www/py-httpx-socks/Makefile
index 755a787eaae..3da6796eedb 100644
--- a/www/py-httpx-socks/Makefile
+++ b/www/py-httpx-socks/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2021/11/17 08:37:54 adam Exp $
+# $NetBSD: Makefile,v 1.9 2021/12/30 13:05:41 adam Exp $
 
 DISTNAME=	httpx-socks-0.6.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -16,7 +16,7 @@ DEPENDS+=	${PYPKGPREFIX}-python-socks>=1.2.4:../../net/py-python-socks
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36 # py-httpcore, py-anyio, py-uvloop
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-httpcore, py-anyio, py-uvloop
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/py-httpx/Makefile b/www/py-httpx/Makefile
index e17dd28eb65..1a43dd55fc4 100644
--- a/www/py-httpx/Makefile
+++ b/www/py-httpx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2021/11/17 08:35:57 adam Exp $
+# $NetBSD: Makefile,v 1.18 2021/12/30 13:05:41 adam Exp $
 
 DISTNAME=	httpx-0.21.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -18,7 +18,7 @@ DEPENDS+=	${PYPKGPREFIX}-sniffio-[0-9]*:../../misc/py-sniffio
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36 # py-httpcore, py-anyio, py-uvloop
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-httpcore, py-anyio, py-uvloop
 
 post-install:
 	cd ${DESTDIR}${PREFIX}/bin && \
diff --git a/www/py-ipywidgets/Makefile b/www/py-ipywidgets/Makefile
index dd42f21f87c..d9641eafad3 100644
--- a/www/py-ipywidgets/Makefile
+++ b/www/py-ipywidgets/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2021/06/10 19:02:25 adam Exp $
+# $NetBSD: Makefile,v 1.5 2021/12/30 13:05:41 adam Exp $
 
 DISTNAME=	ipywidgets-7.6.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -18,7 +18,7 @@ TEST_DEPENDS+=	${PYPKGPREFIX}-test-cov-[0-9]*:../../devel/py-test-cov
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36	# py-ipykernel
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-ipykernel
 
 do-test:
 	cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX}
diff --git a/www/py-nbconvert/Makefile b/www/py-nbconvert/Makefile
index f1297b26a42..3d10f429256 100644
--- a/www/py-nbconvert/Makefile
+++ b/www/py-nbconvert/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2020/08/09 23:37:32 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2021/12/30 13:05:41 adam Exp $
 
 DISTNAME=	nbconvert-5.6.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -32,7 +32,7 @@ TEST_DEPENDS+=	${PYPKGPREFIX}-testpath-[0-9]*:../../devel/py-testpath
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36	# py-ipykernel
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-ipykernel
 
 post-install:
 	cd ${DESTDIR}${PREFIX}/bin && \
diff --git a/www/py-nbformat/Makefile b/www/py-nbformat/Makefile
index 059a35d17f2..747c0a10fab 100644
--- a/www/py-nbformat/Makefile
+++ b/www/py-nbformat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2021/06/29 08:34:18 nia Exp $
+# $NetBSD: Makefile,v 1.9 2021/12/30 13:05:41 adam Exp $
 
 DISTNAME=	nbformat-5.1.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -20,7 +20,7 @@ TEST_DEPENDS+=	${PYPKGPREFIX}-testpath-[0-9]*:../../devel/py-testpath
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 do-test:
 	cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX}
diff --git a/www/py-notebook/Makefile b/www/py-notebook/Makefile
index 957270cb66d..ba3494b8097 100644
--- a/www/py-notebook/Makefile
+++ b/www/py-notebook/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2020/08/09 23:37:32 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2021/12/30 13:05:41 adam Exp $
 
 DISTNAME=	notebook-6.0.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -26,7 +26,7 @@ DEPENDS+=	${PYPKGPREFIX}-zmq>=17.0.0:../../net/py-zmq
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36	# py-ipykernel
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-ipykernel
 
 post-install:
 .for name in bundlerextension nbextension notebook serverextension
diff --git a/www/py-pelican/Makefile b/www/py-pelican/Makefile
index 5b3cd0fa015..e532d69a84c 100644
--- a/www/py-pelican/Makefile
+++ b/www/py-pelican/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2020/12/25 22:07:24 nia Exp $
+# $NetBSD: Makefile,v 1.14 2021/12/30 13:05:42 adam Exp $
 
 DISTNAME=		pelican-4.5.0
 GITHUB_PROJECT=		pelican
@@ -23,8 +23,7 @@ DEPENDS+=		${PYPKGPREFIX}-six>=1.4:../../lang/py-six
 DEPENDS+=		${PYPKGPREFIX}-dateutil-[0-9]*:../../time/py-dateutil
 
 # Starting version 4.5.0, Pelican removed support for Python 2.7
-# Character encoding PLIST problems with Python 3.6
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 PYTHON_VERSIONED_DEPENDENCIES=	sphinx:build
 
 USE_TOOLS+=		make:build sed:build
diff --git a/www/py-respx/Makefile b/www/py-respx/Makefile
index a8519a6b2fb..75bf6c8fe0a 100644
--- a/www/py-respx/Makefile
+++ b/www/py-respx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2021/11/15 17:43:20 adam Exp $
+# $NetBSD: Makefile,v 1.8 2021/12/30 13:05:42 adam Exp $
 
 DISTNAME=	respx-0.19.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -14,7 +14,7 @@ DEPENDS+=	${PYPKGPREFIX}-httpx>=0.21.0:../../www/py-httpx
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36 # py-httpx
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-httpx
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/py-sanic/Makefile b/www/py-sanic/Makefile
index 13303efe90a..6cbad8a5cc7 100644
--- a/www/py-sanic/Makefile
+++ b/www/py-sanic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2021/08/05 18:37:30 adam Exp $
+# $NetBSD: Makefile,v 1.22 2021/12/30 13:05:42 adam Exp $
 
 DISTNAME=	sanic-21.6.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -20,7 +20,7 @@ DEPENDS+=	${PYPKGPREFIX}-websockets>=9.0:../../www/py-websockets
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 post-install:
 	cd ${DESTDIR}${PREFIX}/bin && \
diff --git a/www/py-uvicorn/Makefile b/www/py-uvicorn/Makefile
index 903ab72b322..892e858d5fa 100644
--- a/www/py-uvicorn/Makefile
+++ b/www/py-uvicorn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2021/12/11 19:53:15 adam Exp $
+# $NetBSD: Makefile,v 1.23 2021/12/30 13:05:42 adam Exp $
 
 DISTNAME=	uvicorn-0.16.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -17,7 +17,7 @@ DEPENDS+=	${PYPKGPREFIX}-httptools>=0.2.0:../../www/py-httptools
 DEPENDS+=	${PYPKGPREFIX}-uvloop>=0.14.0:../../devel/py-uvloop
 DEPENDS+=	${PYPKGPREFIX}-websockets>=10.0:../../www/py-websockets
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 .include "../../lang/python/pyversion.mk"
 .if ${_PYTHON_VERSION} < 38
diff --git a/www/py-websockets/Makefile b/www/py-websockets/Makefile
index 1e775d496ae..6318e740d6b 100644
--- a/www/py-websockets/Makefile
+++ b/www/py-websockets/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2021/11/23 21:02:13 adam Exp $
+# $NetBSD: Makefile,v 1.14 2021/12/30 13:05:42 adam Exp $
 
 DISTNAME=	websockets-10.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -10,7 +10,7 @@ HOMEPAGE=	https://github.com/aaugustin/websockets
 COMMENT=	Implementation of the WebSocket Protocol (RFC 6455)
 LICENSE=	modified-bsd
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 36
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/py-qtgraph-qt5/Makefile b/x11/py-qtgraph-qt5/Makefile
index be6dca41a50..6d606dccbc8 100644
--- a/x11/py-qtgraph-qt5/Makefile
+++ b/x11/py-qtgraph-qt5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2021/04/06 08:31:49 tnn Exp $
+# $NetBSD: Makefile,v 1.2 2021/12/30 13:05:42 adam Exp $
 
 DISTNAME=	pyqtgraph-0.12.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/pyqtgraph/qtgraph-qt5/}
@@ -19,7 +19,7 @@ DEPENDS+=	${PYPKGPREFIX}-OpenGL-[0-9]*:../../graphics/py-OpenGL
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE=	36 27
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 .include "../../lang/python/egg.mk"
 .include "../../x11/py-qt5/buildlink3.mk"