Received: by mail.netbsd.org (Postfix, from userid 605) id 479E384E8F; Wed, 29 Mar 2023 09:34:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 75DFF84E69 for ; Wed, 29 Mar 2023 09:34:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id uHDsJvrSK8a9 for ; Wed, 29 Mar 2023 09:34:17 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 141EC84D39 for ; Wed, 29 Mar 2023 09:34:17 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 0D419F9F4; Wed, 29 Mar 2023 09:34:17 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1680082457156590" MIME-Version: 1.0 Date: Wed, 29 Mar 2023 09:34:17 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20230329093417.0D419F9F4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1680082457156590 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Wed Mar 29 09:34:15 UTC 2023 Modified Files: pkgsrc/archivers/py-brotlipy: Makefile pkgsrc/cad/py-MyHDL: Makefile pkgsrc/converters/py-arabic-reshaper: Makefile pkgsrc/databases/py-alembic: Makefile pkgsrc/databases/py-pickleshare: Makefile pkgsrc/devel/py-absl-py: Makefile pkgsrc/devel/py-anyio: Makefile pkgsrc/devel/py-argcomplete: Makefile pkgsrc/devel/py-astroid: Makefile pkgsrc/devel/py-atpublic: Makefile pkgsrc/devel/py-babel: Makefile pkgsrc/devel/py-backports: Makefile pkgsrc/devel/py-blessed: Makefile pkgsrc/devel/py-build: Makefile pkgsrc/devel/py-cached-property: Makefile pkgsrc/devel/py-click: Makefile pkgsrc/devel/py-configupdater: Makefile pkgsrc/devel/py-coverage: Makefile pkgsrc/devel/py-curtsies: Makefile pkgsrc/devel/py-ddt: Makefile pkgsrc/devel/py-doctor: Makefile pkgsrc/devel/py-flake8: Makefile pkgsrc/devel/py-flit_scm: Makefile pkgsrc/devel/py-hatch-fancy-pypi-readme: Makefile pkgsrc/devel/py-hatchling: Makefile pkgsrc/devel/py-hypothesis: Makefile pkgsrc/devel/py-idle: Makefile pkgsrc/devel/py-importlib-metadata: Makefile pkgsrc/devel/py-importlib-resources: Makefile pkgsrc/devel/py-mando: Makefile pkgsrc/devel/py-mock: Makefile pkgsrc/devel/py-nose2: Makefile pkgsrc/devel/py-pathlib2: Makefile pkgsrc/devel/py-pebble: Makefile pkgsrc/devel/py-pep517: Makefile pkgsrc/devel/py-pip: Makefile pkgsrc/devel/py-pip20: Makefile pkgsrc/devel/py-pluggy: Makefile pkgsrc/devel/py-poetry: Makefile pkgsrc/devel/py-poetry-core: Makefile pkgsrc/devel/py-protobuf: Makefile pkgsrc/devel/py-pylint: Makefile pkgsrc/devel/py-pyproject_hooks: Makefile pkgsrc/devel/py-setuptools_scm: Makefile pkgsrc/devel/py-test: Makefile pkgsrc/devel/py-test-randomly: Makefile pkgsrc/devel/py-tox: Makefile pkgsrc/devel/py-traitlets4: Makefile pkgsrc/devel/py-trio: Makefile pkgsrc/devel/py-versioningit: Makefile pkgsrc/devel/py-wcwidth: Makefile pkgsrc/editors/vim-share: options.mk pkgsrc/lang/py-asttokens: Makefile pkgsrc/lang/py-cmake-language-server: Makefile pkgsrc/lang/py-executing: Makefile pkgsrc/lang/py-hy: Makefile pkgsrc/lang/py-mypy: Makefile pkgsrc/mail/py-aiosmtpd: Makefile pkgsrc/mail/py-spf: Makefile pkgsrc/math/py-asdf: Makefile pkgsrc/math/py-numpy: buildlink3.mk pkgsrc/misc/py-ansi: Makefile pkgsrc/misc/py-immutables: Makefile pkgsrc/net/py-kombu: Makefile pkgsrc/net/py-moto: Makefile pkgsrc/security/py-argon2-cffi: Makefile pkgsrc/security/py-cryptodome: Makefile pkgsrc/security/py-cryptography: dependency.mk pkgsrc/security/py-signedjson: Makefile pkgsrc/security/py-u2f: Makefile pkgsrc/security/py27-cryptography: Makefile pkgsrc/sysutils/py-structlog: Makefile pkgsrc/sysutils/py-supervisor: Makefile pkgsrc/textproc/py-black: Makefile pkgsrc/textproc/py-cmudict: Makefile pkgsrc/textproc/py-commonmark: Makefile pkgsrc/textproc/py-diff-match-patch: Makefile pkgsrc/textproc/py-jaraco.text: Makefile pkgsrc/textproc/py-jsonpickle: Makefile pkgsrc/textproc/py-jsonschema: Makefile pkgsrc/textproc/py-markdown: Makefile pkgsrc/textproc/py-markups: Makefile pkgsrc/textproc/py-pallets-sphinx-themes: Makefile pkgsrc/textproc/py-sphinx: Makefile pkgsrc/textproc/py-validate-pyproject: Makefile pkgsrc/time/py-aniso8601: Makefile pkgsrc/time/py-arrow: Makefile pkgsrc/time/py-dateutil: Makefile pkgsrc/time/py-pendulum: Makefile pkgsrc/www/py-flask: Makefile pkgsrc/www/py-h11: Makefile pkgsrc/www/py-httpie: Makefile pkgsrc/www/py-hyperlink: Makefile pkgsrc/www/py-test-django: Makefile pkgsrc/www/py-uvicorn: Makefile pkgsrc/www/py-uwsgitop: Makefile Log Message: *: use PYTHON_VERSION instead of _PYTHON_VERSION To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 pkgsrc/archivers/py-brotlipy/Makefile cvs rdiff -u -r1.30 -r1.31 pkgsrc/cad/py-MyHDL/Makefile cvs rdiff -u -r1.5 -r1.6 pkgsrc/converters/py-arabic-reshaper/Makefile cvs rdiff -u -r1.31 -r1.32 pkgsrc/databases/py-alembic/Makefile cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/py-pickleshare/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/py-absl-py/Makefile cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/py-anyio/Makefile cvs rdiff -u -r1.29 -r1.30 pkgsrc/devel/py-argcomplete/Makefile cvs rdiff -u -r1.73 -r1.74 pkgsrc/devel/py-astroid/Makefile cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/py-atpublic/Makefile cvs rdiff -u -r1.33 -r1.34 pkgsrc/devel/py-babel/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/py-backports/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/py-blessed/Makefile cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/py-build/Makefile cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/py-cached-property/Makefile cvs rdiff -u -r1.23 -r1.24 pkgsrc/devel/py-click/Makefile cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/py-configupdater/Makefile cvs rdiff -u -r1.34 -r1.35 pkgsrc/devel/py-coverage/Makefile cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/py-curtsies/Makefile cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/py-ddt/Makefile cvs rdiff -u -r1.19 -r1.20 pkgsrc/devel/py-doctor/Makefile cvs rdiff -u -r1.44 -r1.45 pkgsrc/devel/py-flake8/Makefile cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/py-flit_scm/Makefile cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/py-hatch-fancy-pypi-readme/Makefile cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/py-hatchling/Makefile cvs rdiff -u -r1.117 -r1.118 pkgsrc/devel/py-hypothesis/Makefile cvs rdiff -u -r1.39 -r1.40 pkgsrc/devel/py-idle/Makefile cvs rdiff -u -r1.31 -r1.32 pkgsrc/devel/py-importlib-metadata/Makefile cvs rdiff -u -r1.15 -r1.16 pkgsrc/devel/py-importlib-resources/Makefile cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/py-mando/Makefile cvs rdiff -u -r1.19 -r1.20 pkgsrc/devel/py-mock/Makefile cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/py-nose2/Makefile cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/py-pathlib2/Makefile cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/py-pebble/Makefile cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/py-pep517/Makefile cvs rdiff -u -r1.60 -r1.61 pkgsrc/devel/py-pip/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/py-pip20/Makefile cvs rdiff -u -r1.20 -r1.21 pkgsrc/devel/py-pluggy/Makefile cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/py-poetry/Makefile cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/py-poetry-core/Makefile cvs rdiff -u -r1.64 -r1.65 pkgsrc/devel/py-protobuf/Makefile cvs rdiff -u -r1.81 -r1.82 pkgsrc/devel/py-pylint/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/py-pyproject_hooks/Makefile cvs rdiff -u -r1.37 -r1.38 pkgsrc/devel/py-setuptools_scm/Makefile cvs rdiff -u -r1.112 -r1.113 pkgsrc/devel/py-test/Makefile cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/py-test-randomly/Makefile cvs rdiff -u -r1.29 -r1.30 pkgsrc/devel/py-tox/Makefile cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/py-traitlets4/Makefile cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/py-trio/Makefile cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/py-versioningit/Makefile cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/py-wcwidth/Makefile cvs rdiff -u -r1.9 -r1.10 pkgsrc/editors/vim-share/options.mk cvs rdiff -u -r1.21 -r1.22 pkgsrc/lang/py-asttokens/Makefile cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/py-cmake-language-server/Makefile cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/py-executing/Makefile cvs rdiff -u -r1.13 -r1.14 pkgsrc/lang/py-hy/Makefile cvs rdiff -u -r1.39 -r1.40 pkgsrc/lang/py-mypy/Makefile cvs rdiff -u -r1.9 -r1.10 pkgsrc/mail/py-aiosmtpd/Makefile cvs rdiff -u -r1.17 -r1.18 pkgsrc/mail/py-spf/Makefile cvs rdiff -u -r1.8 -r1.9 pkgsrc/math/py-asdf/Makefile cvs rdiff -u -r1.16 -r1.17 pkgsrc/math/py-numpy/buildlink3.mk cvs rdiff -u -r1.6 -r1.7 pkgsrc/misc/py-ansi/Makefile cvs rdiff -u -r1.9 -r1.10 pkgsrc/misc/py-immutables/Makefile cvs rdiff -u -r1.34 -r1.35 pkgsrc/net/py-kombu/Makefile cvs rdiff -u -r1.10 -r1.11 pkgsrc/net/py-moto/Makefile cvs rdiff -u -r1.5 -r1.6 pkgsrc/security/py-argon2-cffi/Makefile cvs rdiff -u -r1.46 -r1.47 pkgsrc/security/py-cryptodome/Makefile cvs rdiff -u -r1.2 -r1.3 pkgsrc/security/py-cryptography/dependency.mk cvs rdiff -u -r1.7 -r1.8 pkgsrc/security/py-signedjson/Makefile cvs rdiff -u -r1.7 -r1.8 pkgsrc/security/py-u2f/Makefile cvs rdiff -u -r1.5 -r1.6 pkgsrc/security/py27-cryptography/Makefile cvs rdiff -u -r1.16 -r1.17 pkgsrc/sysutils/py-structlog/Makefile cvs rdiff -u -r1.13 -r1.14 pkgsrc/sysutils/py-supervisor/Makefile cvs rdiff -u -r1.13 -r1.14 pkgsrc/textproc/py-black/Makefile cvs rdiff -u -r1.6 -r1.7 pkgsrc/textproc/py-cmudict/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/textproc/py-commonmark/Makefile cvs rdiff -u -r1.5 -r1.6 pkgsrc/textproc/py-diff-match-patch/Makefile cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/py-jaraco.text/Makefile cvs rdiff -u -r1.13 -r1.14 pkgsrc/textproc/py-jsonpickle/Makefile cvs rdiff -u -r1.32 -r1.33 pkgsrc/textproc/py-jsonschema/Makefile cvs rdiff -u -r1.27 -r1.28 pkgsrc/textproc/py-markdown/Makefile cvs rdiff -u -r1.10 -r1.11 pkgsrc/textproc/py-markups/Makefile cvs rdiff -u -r1.9 -r1.10 pkgsrc/textproc/py-pallets-sphinx-themes/Makefile cvs rdiff -u -r1.87 -r1.88 pkgsrc/textproc/py-sphinx/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/textproc/py-validate-pyproject/Makefile cvs rdiff -u -r1.9 -r1.10 pkgsrc/time/py-aniso8601/Makefile cvs rdiff -u -r1.21 -r1.22 pkgsrc/time/py-arrow/Makefile cvs rdiff -u -r1.35 -r1.36 pkgsrc/time/py-dateutil/Makefile cvs rdiff -u -r1.16 -r1.17 pkgsrc/time/py-pendulum/Makefile cvs rdiff -u -r1.27 -r1.28 pkgsrc/www/py-flask/Makefile cvs rdiff -u -r1.11 -r1.12 pkgsrc/www/py-h11/Makefile cvs rdiff -u -r1.14 -r1.15 pkgsrc/www/py-httpie/Makefile cvs rdiff -u -r1.13 -r1.14 pkgsrc/www/py-hyperlink/Makefile cvs rdiff -u -r1.22 -r1.23 pkgsrc/www/py-test-django/Makefile cvs rdiff -u -r1.32 -r1.33 pkgsrc/www/py-uvicorn/Makefile cvs rdiff -u -r1.12 -r1.13 pkgsrc/www/py-uwsgitop/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1680082457156590 Content-Disposition: inline Content-Length: 72895 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/archivers/py-brotlipy/Makefile diff -u pkgsrc/archivers/py-brotlipy/Makefile:1.3 pkgsrc/archivers/py-brotlipy/Makefile:1.4 --- pkgsrc/archivers/py-brotlipy/Makefile:1.3 Tue Jan 4 20:52:30 2022 +++ pkgsrc/archivers/py-brotlipy/Makefile Wed Mar 29 09:34:04 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2022/01/04 20:52:30 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2023/03/29 09:34:04 wiz Exp $ DISTNAME= brotlipy-0.7.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -15,7 +15,7 @@ DEPENDS+= ${PYPKGPREFIX}-cffi>=1.0.0:../ .include "../../lang/python/egg.mk" -.if ${_PYTHON_VERSION} < 33 +.if ${PYTHON_VERSION} == 207 DEPENDS+= ${PYPKGPREFIX}-enum34>=1.0.4:../../devel/py-enum34 .endif Index: pkgsrc/cad/py-MyHDL/Makefile diff -u pkgsrc/cad/py-MyHDL/Makefile:1.30 pkgsrc/cad/py-MyHDL/Makefile:1.31 --- pkgsrc/cad/py-MyHDL/Makefile:1.30 Thu May 5 07:11:55 2022 +++ pkgsrc/cad/py-MyHDL/Makefile Wed Mar 29 09:34:04 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2022/05/05 07:11:55 nia Exp $ +# $NetBSD: Makefile,v 1.31 2023/03/29 09:34:04 wiz Exp $ .include "Makefile.common" @@ -13,7 +13,7 @@ PYTHON_VERSIONED_DEPENDENCIES= test:test .include "../../lang/python/pyversion.mk" # Python 2.x only -- subprocess is part of Python 3.x -.if ${_PYTHON_VERSION} < 32 +.if ${PYTHON_VERSION} == 207 BUILD_DEPENDS+= ${PYPKGPREFIX}-subprocess32-[0-9]*:../../devel/py-subprocess32 .endif Index: pkgsrc/converters/py-arabic-reshaper/Makefile diff -u pkgsrc/converters/py-arabic-reshaper/Makefile:1.5 pkgsrc/converters/py-arabic-reshaper/Makefile:1.6 --- pkgsrc/converters/py-arabic-reshaper/Makefile:1.5 Fri Nov 18 06:06:02 2022 +++ pkgsrc/converters/py-arabic-reshaper/Makefile Wed Mar 29 09:34:04 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2022/11/18 06:06:02 adam Exp $ +# $NetBSD: Makefile,v 1.6 2023/03/29 09:34:04 wiz Exp $ DISTNAME= arabic_reshaper-2.1.4 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/_/-/} @@ -13,7 +13,8 @@ LICENSE= mit DEPENDS+= ${PYPKGPREFIX}-future-[0-9]*:../../devel/py-future .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} == 27 + +.if ${PYTHON_VERSION} == 207 DEPENDS+= ${PYPKGPREFIX}-configparser-[0-9]*:../../devel/py-configparser .endif Index: pkgsrc/databases/py-alembic/Makefile diff -u pkgsrc/databases/py-alembic/Makefile:1.31 pkgsrc/databases/py-alembic/Makefile:1.32 --- pkgsrc/databases/py-alembic/Makefile:1.31 Fri Apr 29 13:27:48 2022 +++ pkgsrc/databases/py-alembic/Makefile Wed Mar 29 09:34:04 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2022/04/29 13:27:48 adam Exp $ +# $NetBSD: Makefile,v 1.32 2023/03/29 09:34:04 wiz Exp $ DISTNAME= alembic-1.7.7 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -23,7 +23,8 @@ PYTHON_VERSIONS_INCOMPATIBLE= 27 USE_PKG_RESOURCES= yes .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} < 39 + +.if ${PYTHON_VERSION} < 309 DEPENDS+= ${PYPKGPREFIX}-importlib-metadata-[0-9]*:../../devel/py-importlib-metadata DEPENDS+= ${PYPKGPREFIX}-importlib-resources-[0-9]*:../../devel/py-importlib-resources .endif Index: pkgsrc/databases/py-pickleshare/Makefile diff -u pkgsrc/databases/py-pickleshare/Makefile:1.3 pkgsrc/databases/py-pickleshare/Makefile:1.4 --- pkgsrc/databases/py-pickleshare/Makefile:1.3 Tue Jan 4 20:52:43 2022 +++ pkgsrc/databases/py-pickleshare/Makefile Wed Mar 29 09:34:04 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2022/01/04 20:52:43 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2023/03/29 09:34:04 wiz Exp $ DISTNAME= pickleshare-0.7.5 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -12,7 +12,8 @@ COMMENT= Tiny shelve-like database with LICENSE= mit .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} == 27 + +.if ${PYTHON_VERSION} == 207 DEPENDS+= ${PYPKGPREFIX}-pathlib2-[0-9]*:../../devel/py-pathlib2 .endif Index: pkgsrc/devel/py-absl-py/Makefile diff -u pkgsrc/devel/py-absl-py/Makefile:1.4 pkgsrc/devel/py-absl-py/Makefile:1.5 --- pkgsrc/devel/py-absl-py/Makefile:1.4 Tue Jan 4 20:52:48 2022 +++ pkgsrc/devel/py-absl-py/Makefile Wed Mar 29 09:34:05 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2022/01/04 20:52:48 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2023/03/29 09:34:05 wiz Exp $ DISTNAME= absl-py-0.14.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -12,8 +12,10 @@ COMMENT= Abseil Python Common Libraries LICENSE= apache-2.0 DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six + .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} == 27 + +.if ${PYTHON_VERSION} == 207 DEPENDS+= ${PYPKGPREFIX}-enum34-[0-9]*:../../devel/py-enum34 .endif Index: pkgsrc/devel/py-anyio/Makefile diff -u pkgsrc/devel/py-anyio/Makefile:1.12 pkgsrc/devel/py-anyio/Makefile:1.13 --- pkgsrc/devel/py-anyio/Makefile:1.12 Thu Oct 20 09:09:22 2022 +++ pkgsrc/devel/py-anyio/Makefile Wed Mar 29 09:34:05 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2022/10/20 09:09:22 adam Exp $ +# $NetBSD: Makefile,v 1.13 2023/03/29 09:34:05 wiz Exp $ DISTNAME= anyio-3.6.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -25,7 +25,8 @@ TEST_DEPENDS+= ${PYPKGPREFIX}-trio-[0-9] PYTHON_VERSIONS_INCOMPATIBLE= 27 # py-uvloop .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} < 38 + +.if ${PYTHON_VERSION} < 308 DEPENDS+= ${PYPKGPREFIX}-typing-extensions-[0-9]*:../../devel/py-typing-extensions TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock .endif Index: pkgsrc/devel/py-argcomplete/Makefile diff -u pkgsrc/devel/py-argcomplete/Makefile:1.29 pkgsrc/devel/py-argcomplete/Makefile:1.30 --- pkgsrc/devel/py-argcomplete/Makefile:1.29 Wed Aug 24 09:25:55 2022 +++ pkgsrc/devel/py-argcomplete/Makefile Wed Mar 29 09:34:05 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2022/08/24 09:25:55 wiz Exp $ +# $NetBSD: Makefile,v 1.30 2023/03/29 09:34:05 wiz Exp $ DISTNAME= argcomplete-1.12.3 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -13,8 +13,10 @@ LICENSE= apache-2.0 TEST_DEPENDS+= ${PYPKGPREFIX}-pexpect-[0-9]*:../../devel/py-pexpect TEST_DEPENDS+= ${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel + .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} < 38 + +.if ${PYTHON_VERSION} < 308 PYTHON_VERSIONED_DEPENDENCIES+= importlib-metadata .endif PYTHON_VERSIONED_DEPENDENCIES+= coverage:test flake8:test Index: pkgsrc/devel/py-astroid/Makefile diff -u pkgsrc/devel/py-astroid/Makefile:1.73 pkgsrc/devel/py-astroid/Makefile:1.74 --- pkgsrc/devel/py-astroid/Makefile:1.73 Thu Mar 9 09:47:47 2023 +++ pkgsrc/devel/py-astroid/Makefile Wed Mar 29 09:34:05 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.73 2023/03/09 09:47:47 adam Exp $ +# $NetBSD: Makefile,v 1.74 2023/03/29 09:34:05 wiz Exp $ DISTNAME= astroid-2.15.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -17,7 +17,8 @@ DEPENDS+= ${PYPKGPREFIX}-wrapt>=1.14:../ PYTHON_VERSIONS_INCOMPATIBLE= 27 .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} != 311 + +.if ${PYTHON_VERSION} < 311 DEPENDS+= ${PYPKGPREFIX}-typing-extensions>=4.0.0:../../devel/py-typing-extensions .endif Index: pkgsrc/devel/py-atpublic/Makefile diff -u pkgsrc/devel/py-atpublic/Makefile:1.8 pkgsrc/devel/py-atpublic/Makefile:1.9 --- pkgsrc/devel/py-atpublic/Makefile:1.8 Tue Jan 4 20:52:51 2022 +++ pkgsrc/devel/py-atpublic/Makefile Wed Mar 29 09:34:05 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2022/01/04 20:52:51 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2023/03/29 09:34:05 wiz Exp $ DISTNAME= atpublic-2.3 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -16,7 +16,8 @@ USE_LANGUAGES= # none PYTHON_VERSIONS_INCOMPATIBLE= 27 .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} < 38 + +.if ${PYTHON_VERSION} < 308 DEPENDS+= ${PYPKGPREFIX}-typing-extensions-[0-9]*:../../devel/py-typing-extensions .endif Index: pkgsrc/devel/py-babel/Makefile diff -u pkgsrc/devel/py-babel/Makefile:1.33 pkgsrc/devel/py-babel/Makefile:1.34 --- pkgsrc/devel/py-babel/Makefile:1.33 Thu May 12 08:20:36 2022 +++ pkgsrc/devel/py-babel/Makefile Wed Mar 29 09:34:05 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2022/05/12 08:20:36 wiz Exp $ +# $NetBSD: Makefile,v 1.34 2023/03/29 09:34:05 wiz Exp $ DISTNAME= Babel-2.9.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} @@ -17,7 +17,7 @@ TEST_DEPENDS+= ${PYPKGPREFIX}-test-runne .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} != 27 +.if ${PYTHON_VERSION} != 207 # freezegun is only available for python 3 TEST_DEPENDS+= ${PYPKGPREFIX}-freezegun-[0-9]*:../../devel/py-freezegun .endif Index: pkgsrc/devel/py-backports/Makefile diff -u pkgsrc/devel/py-backports/Makefile:1.4 pkgsrc/devel/py-backports/Makefile:1.5 --- pkgsrc/devel/py-backports/Makefile:1.4 Mon Nov 8 12:00:18 2021 +++ pkgsrc/devel/py-backports/Makefile Wed Mar 29 09:34:05 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2021/11/08 12:00:18 adam Exp $ +# $NetBSD: Makefile,v 1.5 2023/03/29 09:34:05 wiz Exp $ PKGNAME= ${PYPKGPREFIX}-backports-1.0 PKGREVISION= 2 @@ -15,7 +15,8 @@ PY_PATCHPLIST= yes .include "../../lang/python/pyversion.mk" INSTALLATION_DIRS+= ${PYSITELIB}/backports -.if ${_PYTHON_VERSION} != 27 + +.if ${PYTHON_VERSION} != 207 INSTALLATION_DIRS+= ${PYSITELIB}/backports/__pycache__ .endif @@ -28,7 +29,7 @@ do-build: do-install: ${INSTALL_SCRIPT} ${WRKSRC}/__init__.* ${DESTDIR}${PREFIX}/${PYSITELIB}/backports/ -.if ${_PYTHON_VERSION} != 27 +.if ${PYTHON_VERSION} != 207 ${INSTALL_SCRIPT} ${WRKSRC}/__pycache__/__init__.* \ ${DESTDIR}${PREFIX}/${PYSITELIB}/backports/__pycache__/ .endif Index: pkgsrc/devel/py-blessed/Makefile diff -u pkgsrc/devel/py-blessed/Makefile:1.1 pkgsrc/devel/py-blessed/Makefile:1.2 --- pkgsrc/devel/py-blessed/Makefile:1.1 Thu Sep 15 17:51:07 2022 +++ pkgsrc/devel/py-blessed/Makefile Wed Mar 29 09:34:05 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2022/09/15 17:51:07 adam Exp $ +# $NetBSD: Makefile,v 1.2 2023/03/29 09:34:05 wiz Exp $ DISTNAME= blessed-1.19.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -16,7 +16,8 @@ DEPENDS+= ${PYPKGPREFIX}-wcwidth>=0.1.4: USE_LANGUAGES= # none .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} == 27 + +.if ${PYTHON_VERSION} == 207 DEPENDS+= ${PYPKGPREFIX}-backports.functools_lru_cache-[0-9]*:../../devel/py-backports.functools_lru_cache .endif Index: pkgsrc/devel/py-build/Makefile diff -u pkgsrc/devel/py-build/Makefile:1.12 pkgsrc/devel/py-build/Makefile:1.13 --- pkgsrc/devel/py-build/Makefile:1.12 Tue Feb 14 16:10:02 2023 +++ pkgsrc/devel/py-build/Makefile Wed Mar 29 09:34:06 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2023/02/14 16:10:02 adam Exp $ +# $NetBSD: Makefile,v 1.13 2023/03/29 09:34:06 wiz Exp $ DISTNAME= build-0.10.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -21,7 +21,8 @@ USE_PKG_RESOURCES= yes PYTHON_VERSIONS_INCOMPATIBLE= 27 .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} != 311 + +.if ${PYTHON_VERSION} < 311 DEPENDS+= ${PYPKGPREFIX}-tomli>=1.0.0:../../textproc/py-tomli .endif Index: pkgsrc/devel/py-cached-property/Makefile diff -u pkgsrc/devel/py-cached-property/Makefile:1.14 pkgsrc/devel/py-cached-property/Makefile:1.15 --- pkgsrc/devel/py-cached-property/Makefile:1.14 Thu May 12 08:20:36 2022 +++ pkgsrc/devel/py-cached-property/Makefile Wed Mar 29 09:34:06 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2022/05/12 08:20:36 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2023/03/29 09:34:06 wiz Exp $ DISTNAME= cached-property-1.5.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -13,7 +13,7 @@ LICENSE= modified-bsd .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} != 27 +.if ${PYTHON_VERSION} != 207 # freezegun is only available for python 3 TEST_DEPENDS+= ${PYPKGPREFIX}-freezegun-[0-9]*:../../devel/py-freezegun .endif Index: pkgsrc/devel/py-click/Makefile diff -u pkgsrc/devel/py-click/Makefile:1.23 pkgsrc/devel/py-click/Makefile:1.24 --- pkgsrc/devel/py-click/Makefile:1.23 Fri Apr 29 11:57:21 2022 +++ pkgsrc/devel/py-click/Makefile Wed Mar 29 09:34:06 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2022/04/29 11:57:21 adam Exp $ +# $NetBSD: Makefile,v 1.24 2023/03/29 09:34:06 wiz Exp $ DISTNAME= click-8.1.3 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -14,7 +14,7 @@ PYTHON_VERSIONS_INCOMPATIBLE= 27 .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} < 38 +.if ${PYTHON_VERSION} < 308 DEPENDS+= ${PYPKGPREFIX}-importlib-metadata-[0-9]*:../../devel/py-importlib-metadata .endif Index: pkgsrc/devel/py-configupdater/Makefile diff -u pkgsrc/devel/py-configupdater/Makefile:1.3 pkgsrc/devel/py-configupdater/Makefile:1.4 --- pkgsrc/devel/py-configupdater/Makefile:1.3 Wed Sep 14 10:49:32 2022 +++ pkgsrc/devel/py-configupdater/Makefile Wed Mar 29 09:34:06 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2022/09/14 10:49:32 adam Exp $ +# $NetBSD: Makefile,v 1.4 2023/03/29 09:34:06 wiz Exp $ DISTNAME= ConfigUpdater-3.1.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} @@ -24,7 +24,7 @@ PYTHON_VERSIONS_INCOMPATIBLE= 27 .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} == 37 +.if ${PYTHON_VERSION} == 307 DEPENDS+= ${PYPKGPREFIX}-importlib-metadata>0:../../devel/py-importlib-metadata .endif Index: pkgsrc/devel/py-coverage/Makefile diff -u pkgsrc/devel/py-coverage/Makefile:1.34 pkgsrc/devel/py-coverage/Makefile:1.35 --- pkgsrc/devel/py-coverage/Makefile:1.34 Tue Nov 8 13:39:17 2022 +++ pkgsrc/devel/py-coverage/Makefile Wed Mar 29 09:34:06 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2022/11/08 13:39:17 adam Exp $ +# $NetBSD: Makefile,v 1.35 2023/03/29 09:34:06 wiz Exp $ DISTNAME= coverage-6.5.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -24,7 +24,8 @@ USE_PKG_RESOURCES= yes PYTHON_VERSIONS_INCOMPATIBLE= 27 .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} < 311 + +.if ${PYTHON_VERSION} < 311 DEPENDS+= ${PYPKGPREFIX}-tomli-[0-9]*:../../textproc/py-tomli .endif Index: pkgsrc/devel/py-curtsies/Makefile diff -u pkgsrc/devel/py-curtsies/Makefile:1.11 pkgsrc/devel/py-curtsies/Makefile:1.12 --- pkgsrc/devel/py-curtsies/Makefile:1.11 Thu Oct 13 16:43:42 2022 +++ pkgsrc/devel/py-curtsies/Makefile Wed Mar 29 09:34:06 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2022/10/13 16:43:42 adam Exp $ +# $NetBSD: Makefile,v 1.12 2023/03/29 09:34:06 wiz Exp $ DISTNAME= curtsies-0.4.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -21,7 +21,8 @@ USE_LANGUAGES= # none PYTHON_VERSIONS_INCOMPATIBLE= 27 .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} < 38 + +.if ${PYTHON_VERSION} < 308 DEPENDS+= ${PYPKGPREFIX}-backports.cached-property-[0-9]*:../../devel/py-backports.cached-property .endif Index: pkgsrc/devel/py-ddt/Makefile diff -u pkgsrc/devel/py-ddt/Makefile:1.10 pkgsrc/devel/py-ddt/Makefile:1.11 --- pkgsrc/devel/py-ddt/Makefile:1.10 Mon Mar 7 20:03:14 2022 +++ pkgsrc/devel/py-ddt/Makefile Wed Mar 29 09:34:06 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2022/03/07 20:03:14 adam Exp $ +# $NetBSD: Makefile,v 1.11 2023/03/29 09:34:06 wiz Exp $ DISTNAME= ddt-1.4.4 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -11,7 +11,8 @@ COMMENT= Data-Driven/Decorated Tests LICENSE= mit .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} == 27 + +.if ${PYTHON_VERSION} == 207 DEPENDS+= ${PYPKGPREFIX}-enum34-[0-9]*:../../devel/py-enum34 .endif Index: pkgsrc/devel/py-doctor/Makefile diff -u pkgsrc/devel/py-doctor/Makefile:1.19 pkgsrc/devel/py-doctor/Makefile:1.20 --- pkgsrc/devel/py-doctor/Makefile:1.19 Tue Nov 29 17:13:22 2022 +++ pkgsrc/devel/py-doctor/Makefile Wed Mar 29 09:34:06 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2022/11/29 17:13:22 adam Exp $ +# $NetBSD: Makefile,v 1.20 2023/03/29 09:34:06 wiz Exp $ DISTNAME= pydoctor-22.9.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//} @@ -28,7 +28,8 @@ TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9] PYTHON_VERSIONS_INCOMPATIBLE= 27 37 .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} == 38 + +.if ${PYTHON_VERSION} == 308 DEPENDS+= ${PYPKGPREFIX}-importlib-resources-[0-9]*:../../devel/py-importlib-resources .endif Index: pkgsrc/devel/py-flake8/Makefile diff -u pkgsrc/devel/py-flake8/Makefile:1.44 pkgsrc/devel/py-flake8/Makefile:1.45 --- pkgsrc/devel/py-flake8/Makefile:1.44 Tue Feb 1 10:02:44 2022 +++ pkgsrc/devel/py-flake8/Makefile Wed Mar 29 09:34:06 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2022/02/01 10:02:44 wiz Exp $ +# $NetBSD: Makefile,v 1.45 2023/03/29 09:34:06 wiz Exp $ DISTNAME= flake8-4.0.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -18,7 +18,7 @@ PYTHON_VERSIONS_INCOMPATIBLE= 27 .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} < 38 +.if ${PYTHON_VERSION} < 308 DEPENDS+= ${PYPKGPREFIX}-importlib-metadata-[0-9]*:../../devel/py-importlib-metadata .endif Index: pkgsrc/devel/py-flit_scm/Makefile diff -u pkgsrc/devel/py-flit_scm/Makefile:1.2 pkgsrc/devel/py-flit_scm/Makefile:1.3 --- pkgsrc/devel/py-flit_scm/Makefile:1.2 Mon Nov 14 09:13:44 2022 +++ pkgsrc/devel/py-flit_scm/Makefile Wed Mar 29 09:34:07 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2022/11/14 09:13:44 adam Exp $ +# $NetBSD: Makefile,v 1.3 2023/03/29 09:34:07 wiz Exp $ DISTNAME= flit_scm-1.7.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -18,7 +18,8 @@ USE_LANGUAGES= # none PYTHON_VERSIONS_INCOMPATIBLE= 27 .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} < 311 + +.if ${PYTHON_VERSION} < 311 DEPENDS+= ${PYPKGPREFIX}-tomli-[0-9]*:../../textproc/py-tomli .endif Index: pkgsrc/devel/py-hatch-fancy-pypi-readme/Makefile diff -u pkgsrc/devel/py-hatch-fancy-pypi-readme/Makefile:1.3 pkgsrc/devel/py-hatch-fancy-pypi-readme/Makefile:1.4 --- pkgsrc/devel/py-hatch-fancy-pypi-readme/Makefile:1.3 Fri Nov 18 18:52:07 2022 +++ pkgsrc/devel/py-hatch-fancy-pypi-readme/Makefile Wed Mar 29 09:34:07 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2022/11/18 18:52:07 adam Exp $ +# $NetBSD: Makefile,v 1.4 2023/03/29 09:34:07 wiz Exp $ DISTNAME= hatch_fancy_pypi_readme-22.8.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/_/-/g} @@ -20,7 +20,8 @@ USE_LANGUAGES= # none PYTHON_VERSIONS_INCOMPATIBLE= 27 .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} < 311 + +.if ${PYTHON_VERSION} < 311 DEPENDS+= ${PYPKGPREFIX}-tomli-[0-9]*:../../textproc/py-tomli .endif Index: pkgsrc/devel/py-hatchling/Makefile diff -u pkgsrc/devel/py-hatchling/Makefile:1.8 pkgsrc/devel/py-hatchling/Makefile:1.9 --- pkgsrc/devel/py-hatchling/Makefile:1.8 Thu Mar 9 10:26:15 2023 +++ pkgsrc/devel/py-hatchling/Makefile Wed Mar 29 09:34:07 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2023/03/09 10:26:15 adam Exp $ +# $NetBSD: Makefile,v 1.9 2023/03/29 09:34:07 wiz Exp $ DISTNAME= hatchling-1.13.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -20,7 +20,8 @@ USE_LANGUAGES= # none PYTHON_VERSIONS_INCOMPATIBLE= 27 .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} != 311 + +.if ${PYTHON_VERSION} < 311 DEPENDS+= ${PYPKGPREFIX}-tomli>=1.2.2:../../textproc/py-tomli .endif Index: pkgsrc/devel/py-hypothesis/Makefile diff -u pkgsrc/devel/py-hypothesis/Makefile:1.117 pkgsrc/devel/py-hypothesis/Makefile:1.118 --- pkgsrc/devel/py-hypothesis/Makefile:1.117 Wed Feb 8 10:31:14 2023 +++ pkgsrc/devel/py-hypothesis/Makefile Wed Mar 29 09:34:07 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.117 2023/02/08 10:31:14 adam Exp $ +# $NetBSD: Makefile,v 1.118 2023/03/29 09:34:07 wiz Exp $ # # Changelog: https://hypothesis.readthedocs.io/en/latest/changes.html @@ -22,7 +22,8 @@ USE_PKG_RESOURCES= yes PYTHON_VERSIONS_INCOMPATIBLE= 27 .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} != 311 + +.if ${PYTHON_VERSION} < 311 DEPENDS+= ${PYPKGPREFIX}-exceptiongroup>=1.0.0:../../devel/py-exceptiongroup .endif Index: pkgsrc/devel/py-idle/Makefile diff -u pkgsrc/devel/py-idle/Makefile:1.39 pkgsrc/devel/py-idle/Makefile:1.40 --- pkgsrc/devel/py-idle/Makefile:1.39 Wed Jan 8 13:44:41 2020 +++ pkgsrc/devel/py-idle/Makefile Wed Mar 29 09:34:07 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2020/01/08 13:44:41 joerg Exp $ +# $NetBSD: Makefile,v 1.40 2023/03/29 09:34:07 wiz Exp $ PKGNAME= ${PYPKGPREFIX}-idle-${PY_DISTVERSION} CATEGORIES= devel python @@ -18,7 +18,7 @@ PY_PATCHPLIST= yes # .include "../../lang/python/extension.mk" -.if ${_PYTHON_VERSION} >= 31 +.if ${PYTHON_VERSION} != 207 IDLE_NAME= idle3 .else IDLE_NAME= idle Index: pkgsrc/devel/py-importlib-metadata/Makefile diff -u pkgsrc/devel/py-importlib-metadata/Makefile:1.31 pkgsrc/devel/py-importlib-metadata/Makefile:1.32 --- pkgsrc/devel/py-importlib-metadata/Makefile:1.31 Sat Nov 5 22:24:39 2022 +++ pkgsrc/devel/py-importlib-metadata/Makefile Wed Mar 29 09:34:07 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2022/11/05 22:24:39 joerg Exp $ +# $NetBSD: Makefile,v 1.32 2023/03/29 09:34:07 wiz Exp $ DISTNAME= importlib_metadata-4.12.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/_/-/} @@ -23,7 +23,7 @@ PYTHON_VERSIONS_INCOMPATIBLE= 27 .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} < 38 +.if ${PYTHON_VERSION} < 308 DEPENDS+= ${PYPKGPREFIX}-typing-extensions>=3.6.4:../../devel/py-typing-extensions .endif Index: pkgsrc/devel/py-importlib-resources/Makefile diff -u pkgsrc/devel/py-importlib-resources/Makefile:1.15 pkgsrc/devel/py-importlib-resources/Makefile:1.16 --- pkgsrc/devel/py-importlib-resources/Makefile:1.15 Thu Dec 29 12:37:50 2022 +++ pkgsrc/devel/py-importlib-resources/Makefile Wed Mar 29 09:34:07 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2022/12/29 12:37:50 adam Exp $ +# $NetBSD: Makefile,v 1.16 2023/03/29 09:34:07 wiz Exp $ DISTNAME= importlib_resources-5.10.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/_/-/} @@ -18,7 +18,7 @@ USE_LANGUAGES= # none PYTHON_VERSIONS_INCOMPATIBLE= 27 .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} < 310 +.if ${PYTHON_VERSION} < 310 DEPENDS+= ${PYPKGPREFIX}-zipp>=3.1.0:../../archivers/py-zipp .endif Index: pkgsrc/devel/py-mando/Makefile diff -u pkgsrc/devel/py-mando/Makefile:1.5 pkgsrc/devel/py-mando/Makefile:1.6 --- pkgsrc/devel/py-mando/Makefile:1.5 Wed Apr 27 11:55:12 2022 +++ pkgsrc/devel/py-mando/Makefile Wed Mar 29 09:34:08 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2022/04/27 11:55:12 adam Exp $ +# $NetBSD: Makefile,v 1.6 2023/03/29 09:34:08 wiz Exp $ DISTNAME= mando-0.7.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -12,7 +12,8 @@ LICENSE= mit DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} == 27 + +.if ${PYTHON_VERSION} == 207 DEPENDS+= ${PYPKGPREFIX}-funcsigs-[0-9]*:../../devel/py-funcsigs .endif Index: pkgsrc/devel/py-mock/Makefile diff -u pkgsrc/devel/py-mock/Makefile:1.19 pkgsrc/devel/py-mock/Makefile:1.20 --- pkgsrc/devel/py-mock/Makefile:1.19 Tue Jan 4 20:53:17 2022 +++ pkgsrc/devel/py-mock/Makefile Wed Mar 29 09:34:08 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2022/01/04 20:53:17 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2023/03/29 09:34:08 wiz Exp $ DISTNAME= mock-3.0.5 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -14,7 +14,8 @@ LICENSE= gnu-gpl-v2 DEPENDS+= ${PYPKGPREFIX}-six>=1.7:../../lang/py-six .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} == 27 + +.if ${PYTHON_VERSION} == 207 DEPENDS+= ${PYPKGPREFIX}-funcsigs>=1:../../devel/py-funcsigs .endif Index: pkgsrc/devel/py-nose2/Makefile diff -u pkgsrc/devel/py-nose2/Makefile:1.12 pkgsrc/devel/py-nose2/Makefile:1.13 --- pkgsrc/devel/py-nose2/Makefile:1.12 Wed Aug 24 09:25:56 2022 +++ pkgsrc/devel/py-nose2/Makefile Wed Mar 29 09:34:08 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2022/08/24 09:25:56 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2023/03/29 09:34:08 wiz Exp $ DISTNAME= nose2-0.10.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -12,8 +12,10 @@ COMMENT= Next generation of nicer testin LICENSE= 2-clause-bsd DEPENDS+= ${PYPKGPREFIX}-six>=1.7:../../lang/py-six + .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} == 27 + +.if ${PYTHON_VERSION} == 207 DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock .endif Index: pkgsrc/devel/py-pathlib2/Makefile diff -u pkgsrc/devel/py-pathlib2/Makefile:1.12 pkgsrc/devel/py-pathlib2/Makefile:1.13 --- pkgsrc/devel/py-pathlib2/Makefile:1.12 Mon May 23 08:31:51 2022 +++ pkgsrc/devel/py-pathlib2/Makefile Wed Mar 29 09:34:08 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2022/05/23 08:31:51 adam Exp $ +# $NetBSD: Makefile,v 1.13 2023/03/29 09:34:08 wiz Exp $ DISTNAME= pathlib2-2.3.7.post1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/post//} @@ -13,7 +13,8 @@ LICENSE= mit DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} == 27 + +.if ${PYTHON_VERSION} == 207 DEPENDS+= ${PYPKGPREFIX}-scandir-[0-9]*:../../devel/py-scandir DEPENDS+= ${PYPKGPREFIX}-typing-[0-9]*:../../devel/py-typing TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock Index: pkgsrc/devel/py-pebble/Makefile diff -u pkgsrc/devel/py-pebble/Makefile:1.8 pkgsrc/devel/py-pebble/Makefile:1.9 --- pkgsrc/devel/py-pebble/Makefile:1.8 Tue Jan 4 20:53:20 2022 +++ pkgsrc/devel/py-pebble/Makefile Wed Mar 29 09:34:08 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2022/01/04 20:53:20 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2023/03/29 09:34:08 wiz Exp $ DISTNAME= Pebble-4.5.3 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} @@ -12,7 +12,8 @@ COMMENT= Threading and multiprocessing e LICENSE= gnu-lgpl-v3 .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} == 27 + +.if ${PYTHON_VERSION} == 207 DEPENDS+= ${PYPKGPREFIX}-futures-[0-9]*:../../devel/py-futures .endif Index: pkgsrc/devel/py-pep517/Makefile diff -u pkgsrc/devel/py-pep517/Makefile:1.11 pkgsrc/devel/py-pep517/Makefile:1.12 --- pkgsrc/devel/py-pep517/Makefile:1.11 Mon Nov 14 08:43:05 2022 +++ pkgsrc/devel/py-pep517/Makefile Wed Mar 29 09:34:08 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2022/11/14 08:43:05 adam Exp $ +# $NetBSD: Makefile,v 1.12 2023/03/29 09:34:08 wiz Exp $ DISTNAME= pep517-0.13.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -20,7 +20,8 @@ NO_BUILD= yes PYTHON_VERSIONS_INCOMPATIBLE= 27 .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} < 311 + +.if ${PYTHON_VERSION} < 311 DEPENDS+= ${PYPKGPREFIX}-tomli>=1.1.0:../../textproc/py-tomli .endif Index: pkgsrc/devel/py-pip/Makefile diff -u pkgsrc/devel/py-pip/Makefile:1.60 pkgsrc/devel/py-pip/Makefile:1.61 --- pkgsrc/devel/py-pip/Makefile:1.60 Mon Mar 6 15:49:29 2023 +++ pkgsrc/devel/py-pip/Makefile Wed Mar 29 09:34:08 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.60 2023/03/06 15:49:29 wiz Exp $ +# $NetBSD: Makefile,v 1.61 2023/03/29 09:34:08 wiz Exp $ DISTNAME= pip-23.0.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -22,7 +22,7 @@ PYTHON_VERSIONS_INCOMPATIBLE= 27 USE_PKG_RESOURCES= yes .include "../../lang/python/pyversion.mk" -FILES_SUBST+= PYMAJORVERSION=${_PYTHON_VERSION:C/^([0-9]).*/\1/} +FILES_SUBST+= PYMAJORVERSION=${PYTHON_VERSION:C/^([0-9]).*/\1/} post-install: cd ${DESTDIR}${PREFIX}/bin && ${RM} -f pip pip[2-3] Index: pkgsrc/devel/py-pip20/Makefile diff -u pkgsrc/devel/py-pip20/Makefile:1.4 pkgsrc/devel/py-pip20/Makefile:1.5 --- pkgsrc/devel/py-pip20/Makefile:1.4 Wed Jan 5 20:47:35 2022 +++ pkgsrc/devel/py-pip20/Makefile Wed Mar 29 09:34:08 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2022/01/05 20:47:35 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2023/03/29 09:34:08 wiz Exp $ DISTNAME= pip-20.3.4 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -22,7 +22,7 @@ PYTHON_VERSIONS_ACCEPTED= 27 USE_PKG_RESOURCES= yes .include "../../lang/python/pyversion.mk" -FILES_SUBST+= PYMAJORVERSION=${_PYTHON_VERSION:C/^([0-9]).*/\1/} +FILES_SUBST+= PYMAJORVERSION=${PYTHON_VERSION:C/^([0-9]).*/\1/} post-install: cd ${DESTDIR}${PREFIX}/bin && ${RM} -f pip pip[2-3] Index: pkgsrc/devel/py-pluggy/Makefile diff -u pkgsrc/devel/py-pluggy/Makefile:1.20 pkgsrc/devel/py-pluggy/Makefile:1.21 --- pkgsrc/devel/py-pluggy/Makefile:1.20 Tue Oct 11 13:14:15 2022 +++ pkgsrc/devel/py-pluggy/Makefile Wed Mar 29 09:34:09 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2022/10/11 13:14:15 adam Exp $ +# $NetBSD: Makefile,v 1.21 2023/03/29 09:34:09 wiz Exp $ DISTNAME= pluggy-1.0.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -19,7 +19,8 @@ USE_LANGUAGES= # none PYTHON_VERSIONS_INCOMPATIBLE= 27 .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} < 38 + +.if ${PYTHON_VERSION} < 308 DEPENDS+= ${PYPKGPREFIX}-importlib-metadata>=0.12:../../devel/py-importlib-metadata .endif Index: pkgsrc/devel/py-poetry/Makefile diff -u pkgsrc/devel/py-poetry/Makefile:1.5 pkgsrc/devel/py-poetry/Makefile:1.6 --- pkgsrc/devel/py-poetry/Makefile:1.5 Mon Aug 22 17:59:50 2022 +++ pkgsrc/devel/py-poetry/Makefile Wed Mar 29 09:34:09 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2022/08/22 17:59:50 adam Exp $ +# $NetBSD: Makefile,v 1.6 2023/03/29 09:34:09 wiz Exp $ DISTNAME= poetry-1.1.15 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -32,7 +32,8 @@ TEST_DEPENDS+= ${PYPKGPREFIX}-test>=6.0: PYTHON_VERSIONS_INCOMPATIBLE= 27 .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} < 38 + +.if ${PYTHON_VERSION} < 308 TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock .endif Index: pkgsrc/devel/py-poetry-core/Makefile diff -u pkgsrc/devel/py-poetry-core/Makefile:1.3 pkgsrc/devel/py-poetry-core/Makefile:1.4 --- pkgsrc/devel/py-poetry-core/Makefile:1.3 Thu Oct 6 13:07:19 2022 +++ pkgsrc/devel/py-poetry-core/Makefile Wed Mar 29 09:34:09 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2022/10/06 13:07:19 gdt Exp $ +# $NetBSD: Makefile,v 1.4 2023/03/29 09:34:09 wiz Exp $ # Do not update to 1.3.x without understanding the impacts of a change # that breaks at least some poetry-using programs. -gdt @@ -16,7 +16,8 @@ LICENSE= mit PYTHON_VERSIONS_INCOMPATIBLE= 27 .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} < 38 + +.if ${PYTHON_VERSION} < 308 DEPENDS+= ${PYPKGPREFIX}-importlib-metadata>=1.7.0:../../devel/py-importlib-metadata .endif Index: pkgsrc/devel/py-protobuf/Makefile diff -u pkgsrc/devel/py-protobuf/Makefile:1.64 pkgsrc/devel/py-protobuf/Makefile:1.65 --- pkgsrc/devel/py-protobuf/Makefile:1.64 Fri Dec 16 10:22:57 2022 +++ pkgsrc/devel/py-protobuf/Makefile Wed Mar 29 09:34:09 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.64 2022/12/16 10:22:57 adam Exp $ +# $NetBSD: Makefile,v 1.65 2023/03/29 09:34:09 wiz Exp $ DISTNAME= protobuf-4.21.12 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -18,7 +18,8 @@ MAKE_ENV+= PROTOC=${PREFIX}/bin/protoc PLIST_VARS+= cpp .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} != 311 + +.if ${PYTHON_VERSION} < 311 # As of 4.21.9, the sources do contain outdated code that only supports Python < 3.11 # https://github.com/protocolbuffers/protobuf/issues/11031#issuecomment-1321390551 # Do not use C++ implementation for Python 3.11. Index: pkgsrc/devel/py-pylint/Makefile diff -u pkgsrc/devel/py-pylint/Makefile:1.81 pkgsrc/devel/py-pylint/Makefile:1.82 --- pkgsrc/devel/py-pylint/Makefile:1.81 Thu Mar 9 09:50:19 2023 +++ pkgsrc/devel/py-pylint/Makefile Wed Mar 29 09:34:09 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.81 2023/03/09 09:50:19 adam Exp $ +# $NetBSD: Makefile,v 1.82 2023/03/29 09:34:09 wiz Exp $ DISTNAME= pylint-2.17.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -23,10 +23,10 @@ USE_LANGUAGES= # none PYTHON_VERSIONS_INCOMPATIBLE= 27 .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} == 39 || ${_PYTHON_VERSION} == 38 +.if ${PYTHON_VERSION} < 310 DEPENDS+= ${PYPKGPREFIX}-typing-extensions>=3.10.0:../../devel/py-typing-extensions .endif -.if ${_PYTHON_VERSION} == 310 || ${_PYTHON_VERSION} == 39 || ${_PYTHON_VERSION} == 38 +.if ${PYTHON_VERSION} < 311 DEPENDS+= ${PYPKGPREFIX}-tomli>=1.1.0:../../textproc/py-tomli .endif Index: pkgsrc/devel/py-pyproject_hooks/Makefile diff -u pkgsrc/devel/py-pyproject_hooks/Makefile:1.1 pkgsrc/devel/py-pyproject_hooks/Makefile:1.2 --- pkgsrc/devel/py-pyproject_hooks/Makefile:1.1 Tue Feb 14 17:42:54 2023 +++ pkgsrc/devel/py-pyproject_hooks/Makefile Wed Mar 29 09:34:09 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2023/02/14 17:42:54 adam Exp $ +# $NetBSD: Makefile,v 1.2 2023/03/29 09:34:09 wiz Exp $ DISTNAME= pyproject_hooks-1.0.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -17,7 +17,8 @@ USE_PKG_RESOURCES= yes PYTHON_VERSIONS_INCOMPATIBLE= 27 .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} != 311 + +.if ${PYTHON_VERSION} < 311 DEPENDS+= ${PYPKGPREFIX}-tomli>=1.1.0:../../textproc/py-tomli .endif Index: pkgsrc/devel/py-setuptools_scm/Makefile diff -u pkgsrc/devel/py-setuptools_scm/Makefile:1.37 pkgsrc/devel/py-setuptools_scm/Makefile:1.38 --- pkgsrc/devel/py-setuptools_scm/Makefile:1.37 Wed Jan 4 10:32:00 2023 +++ pkgsrc/devel/py-setuptools_scm/Makefile Wed Mar 29 09:34:09 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2023/01/04 10:32:00 adam Exp $ +# $NetBSD: Makefile,v 1.38 2023/03/29 09:34:09 wiz Exp $ DISTNAME= setuptools_scm-7.1.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -23,7 +23,8 @@ USE_LANGUAGES= # none PYTHON_VERSIONS_INCOMPATIBLE= 27 .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} != 311 + +.if ${PYTHON_VERSION} < 311 DEPENDS+= ${PYPKGPREFIX}-tomli>=1.0.0:../../textproc/py-tomli .endif Index: pkgsrc/devel/py-test/Makefile diff -u pkgsrc/devel/py-test/Makefile:1.112 pkgsrc/devel/py-test/Makefile:1.113 --- pkgsrc/devel/py-test/Makefile:1.112 Tue Mar 7 18:58:03 2023 +++ pkgsrc/devel/py-test/Makefile Wed Mar 29 09:34:09 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.112 2023/03/07 18:58:03 adam Exp $ +# $NetBSD: Makefile,v 1.113 2023/03/29 09:34:09 wiz Exp $ DISTNAME= pytest-7.2.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//} @@ -34,7 +34,8 @@ USE_PKG_RESOURCES= yes PYTHON_VERSIONS_INCOMPATIBLE= 27 .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} != 311 + +.if ${PYTHON_VERSION} < 311 DEPENDS+= ${PYPKGPREFIX}-exceptiongroup>=1.0.0:../../devel/py-exceptiongroup DEPENDS+= ${PYPKGPREFIX}-tomli>=1.0.0:../../textproc/py-tomli .endif Index: pkgsrc/devel/py-test-randomly/Makefile diff -u pkgsrc/devel/py-test-randomly/Makefile:1.8 pkgsrc/devel/py-test-randomly/Makefile:1.9 --- pkgsrc/devel/py-test-randomly/Makefile:1.8 Thu Sep 8 07:44:36 2022 +++ pkgsrc/devel/py-test-randomly/Makefile Wed Mar 29 09:34:09 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2022/09/08 07:44:36 adam Exp $ +# $NetBSD: Makefile,v 1.9 2023/03/29 09:34:09 wiz Exp $ DISTNAME= pytest-randomly-3.12.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//} @@ -17,7 +17,8 @@ USE_LANGUAGES= # none PYTHON_VERSIONS_INCOMPATIBLE= 27 .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} < 310 + +.if ${PYTHON_VERSION} < 310 DEPENDS+= ${PYPKGPREFIX}-importlib-metadata>=3.6.0:../../devel/py-importlib-metadata .endif Index: pkgsrc/devel/py-tox/Makefile diff -u pkgsrc/devel/py-tox/Makefile:1.29 pkgsrc/devel/py-tox/Makefile:1.30 --- pkgsrc/devel/py-tox/Makefile:1.29 Sun May 1 09:45:41 2022 +++ pkgsrc/devel/py-tox/Makefile Wed Mar 29 09:34:10 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2022/05/01 09:45:41 wiz Exp $ +# $NetBSD: Makefile,v 1.30 2023/03/29 09:34:10 wiz Exp $ DISTNAME= tox-3.24.5 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -31,7 +31,8 @@ TEST_DEPENDS+= ${PYPKGPREFIX}-test-xdist PYTHON_VERSIONS_INCOMPATIBLE= 27 # py-filelock .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} < 38 + +.if ${PYTHON_VERSION} < 308 DEPENDS+= ${PYPKGPREFIX}-importlib-metadata-[0-9]*:../../devel/py-importlib-metadata .endif Index: pkgsrc/devel/py-traitlets4/Makefile diff -u pkgsrc/devel/py-traitlets4/Makefile:1.5 pkgsrc/devel/py-traitlets4/Makefile:1.6 --- pkgsrc/devel/py-traitlets4/Makefile:1.5 Sun Jan 9 11:58:14 2022 +++ pkgsrc/devel/py-traitlets4/Makefile Wed Mar 29 09:34:10 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2022/01/09 11:58:14 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2023/03/29 09:34:10 wiz Exp $ DISTNAME= traitlets-4.3.3 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -16,7 +16,8 @@ DEPENDS+= ${PYPKGPREFIX}-ipython_genutil DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} == 27 + +.if ${PYTHON_VERSION} == 207 DEPENDS+= ${PYPKGPREFIX}-enum34-[0-9]*:../../devel/py-enum34 .endif Index: pkgsrc/devel/py-trio/Makefile diff -u pkgsrc/devel/py-trio/Makefile:1.7 pkgsrc/devel/py-trio/Makefile:1.8 --- pkgsrc/devel/py-trio/Makefile:1.7 Tue Nov 15 09:49:38 2022 +++ pkgsrc/devel/py-trio/Makefile Wed Mar 29 09:34:10 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2022/11/15 09:49:38 adam Exp $ +# $NetBSD: Makefile,v 1.8 2023/03/29 09:34:10 wiz Exp $ DISTNAME= trio-0.22.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -27,7 +27,8 @@ USE_LANGUAGES= # none PYTHON_VERSIONS_INCOMPATIBLE= 27 .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} < 311 + +.if ${PYTHON_VERSION} < 311 DEPENDS+= ${PYPKGPREFIX}-exceptiongroup>=1.0.0:../../devel/py-exceptiongroup .endif Index: pkgsrc/devel/py-versioningit/Makefile diff -u pkgsrc/devel/py-versioningit/Makefile:1.2 pkgsrc/devel/py-versioningit/Makefile:1.3 --- pkgsrc/devel/py-versioningit/Makefile:1.2 Thu May 12 06:07:02 2022 +++ pkgsrc/devel/py-versioningit/Makefile Wed Mar 29 09:34:10 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2022/05/12 06:07:02 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2023/03/29 09:34:10 wiz Exp $ DISTNAME= versioningit-1.1.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -24,7 +24,7 @@ PYTHON_VERSIONS_INCOMPATIBLE= 27 .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} < 310 +.if ${PYTHON_VERSION} < 310 DEPENDS+= ${PYPKGPREFIX}-importlib-metadata-[0-9]*:../../devel/py-importlib-metadata .endif Index: pkgsrc/devel/py-wcwidth/Makefile diff -u pkgsrc/devel/py-wcwidth/Makefile:1.9 pkgsrc/devel/py-wcwidth/Makefile:1.10 --- pkgsrc/devel/py-wcwidth/Makefile:1.9 Mon Jan 16 21:12:00 2023 +++ pkgsrc/devel/py-wcwidth/Makefile Wed Mar 29 09:34:10 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2023/01/16 21:12:00 adam Exp $ +# $NetBSD: Makefile,v 1.10 2023/03/29 09:34:10 wiz Exp $ DISTNAME= wcwidth-0.2.6 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -11,7 +11,8 @@ COMMENT= Measures number of Terminal col LICENSE= mit .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} == 27 + +.if ${PYTHON_VERSION} == 207 DEPENDS+= ${PYPKGPREFIX}-backports.functools_lru_cache>=1.2.1:../../devel/py-backports.functools_lru_cache .endif Index: pkgsrc/editors/vim-share/options.mk diff -u pkgsrc/editors/vim-share/options.mk:1.9 pkgsrc/editors/vim-share/options.mk:1.10 --- pkgsrc/editors/vim-share/options.mk:1.9 Tue Jun 30 18:49:56 2020 +++ pkgsrc/editors/vim-share/options.mk Wed Mar 29 09:34:10 2023 @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.9 2020/06/30 18:49:56 nia Exp $ +# $NetBSD: options.mk,v 1.10 2023/03/29 09:34:10 wiz Exp $ PKG_SUPPORTED_OPTIONS+= ruby python perl lua luajit PKG_OPTIONS_VAR= PKG_OPTIONS.vim @@ -13,7 +13,7 @@ CONFIGURE_ENV+= vi_cv_path_ruby=${RUBY} .if !empty(PKG_OPTIONS:Mpython) .include "../../lang/python/pyversion.mk" -. if empty(_PYTHON_VERSION:M3*) +. if empty(PYTHON_VERSION:M3*) CONFIGURE_ARGS+= --enable-pythoninterp CONFIGURE_ARGS+= --with-python-command=${PYTHONBIN} . else Index: pkgsrc/lang/py-asttokens/Makefile diff -u pkgsrc/lang/py-asttokens/Makefile:1.21 pkgsrc/lang/py-asttokens/Makefile:1.22 --- pkgsrc/lang/py-asttokens/Makefile:1.21 Wed Mar 8 13:47:54 2023 +++ pkgsrc/lang/py-asttokens/Makefile Wed Mar 29 09:34:10 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2023/03/08 13:47:54 adam Exp $ +# $NetBSD: Makefile,v 1.22 2023/03/29 09:34:10 wiz Exp $ DISTNAME= asttokens-2.2.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -19,7 +19,8 @@ USE_LANGUAGES= # none PYTHON_VERSIONED_DEPENDENCIES+= pip:build setuptools_scm:build .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} == 27 + +.if ${PYTHON_VERSION} == 207 DEPENDS+= ${PYPKGPREFIX}-typing-[0-9]*:../../devel/py-typing TEST_DEPENDS= # none; test depends are incompatible to py27 do-test: Index: pkgsrc/lang/py-cmake-language-server/Makefile diff -u pkgsrc/lang/py-cmake-language-server/Makefile:1.6 pkgsrc/lang/py-cmake-language-server/Makefile:1.7 --- pkgsrc/lang/py-cmake-language-server/Makefile:1.6 Wed Aug 10 11:42:58 2022 +++ pkgsrc/lang/py-cmake-language-server/Makefile Wed Mar 29 09:34:10 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2022/08/10 11:42:58 adam Exp $ +# $NetBSD: Makefile,v 1.7 2023/03/29 09:34:10 wiz Exp $ DISTNAME= cmake-language-server-0.1.6 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -15,7 +15,8 @@ DEPENDS+= ${PYPKGPREFIX}-pygls>=0.12:../ PYTHON_VERSIONS_INCOMPATIBLE= 27 .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} < 38 + +.if ${PYTHON_VERSION} < 308 DEPENDS+= ${PYPKGPREFIX}-importlib-metadata>=4.8:../../devel/py-importlib-metadata .endif Index: pkgsrc/lang/py-executing/Makefile diff -u pkgsrc/lang/py-executing/Makefile:1.3 pkgsrc/lang/py-executing/Makefile:1.4 --- pkgsrc/lang/py-executing/Makefile:1.3 Mon Oct 31 17:12:39 2022 +++ pkgsrc/lang/py-executing/Makefile Wed Mar 29 09:34:11 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2022/10/31 17:12:39 adam Exp $ +# $NetBSD: Makefile,v 1.4 2023/03/29 09:34:11 wiz Exp $ DISTNAME= executing-1.2.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -20,7 +20,8 @@ USE_LANGUAGES= # none PYTHON_VERSIONS_INCOMPATIBLE= 27 .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} == 311 + +.if ${PYTHON_VERSION} >= 311 TEST_DEPENDS+= ${PYPKGPREFIX}-rich-[0-9]*:../../comms/py-rich .endif Index: pkgsrc/lang/py-hy/Makefile diff -u pkgsrc/lang/py-hy/Makefile:1.13 pkgsrc/lang/py-hy/Makefile:1.14 --- pkgsrc/lang/py-hy/Makefile:1.13 Tue Nov 29 22:09:15 2022 +++ pkgsrc/lang/py-hy/Makefile Wed Mar 29 09:34:11 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2022/11/29 22:09:15 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2023/03/29 09:34:11 wiz Exp $ DISTNAME= hy-0.25.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -19,7 +19,8 @@ USE_LANGUAGES= # none PYTHON_VERSIONS_INCOMPATIBLE= 27 .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} < 39 + +.if ${PYTHON_VERSION} < 309 DEPENDS+= ${PYPKGPREFIX}-astor>=0.8:../../devel/py-astor .endif Index: pkgsrc/lang/py-mypy/Makefile diff -u pkgsrc/lang/py-mypy/Makefile:1.39 pkgsrc/lang/py-mypy/Makefile:1.40 --- pkgsrc/lang/py-mypy/Makefile:1.39 Thu Mar 9 08:12:17 2023 +++ pkgsrc/lang/py-mypy/Makefile Wed Mar 29 09:34:11 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2023/03/09 08:12:17 adam Exp $ +# $NetBSD: Makefile,v 1.40 2023/03/29 09:34:11 wiz Exp $ DISTNAME= mypy-1.1.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -20,7 +20,8 @@ PYTHON_VERSIONS_INCOMPATIBLE= 27 USE_PKG_RESOURCES= yes .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} != 311 + +.if ${PYTHON_VERSION} < 311 DEPENDS+= ${PYPKGPREFIX}-tomli>=1.1.0:../../textproc/py-tomli .endif Index: pkgsrc/mail/py-aiosmtpd/Makefile diff -u pkgsrc/mail/py-aiosmtpd/Makefile:1.9 pkgsrc/mail/py-aiosmtpd/Makefile:1.10 --- pkgsrc/mail/py-aiosmtpd/Makefile:1.9 Wed Jan 5 15:41:13 2022 +++ pkgsrc/mail/py-aiosmtpd/Makefile Wed Mar 29 09:34:11 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2022/01/05 15:41:13 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2023/03/29 09:34:11 wiz Exp $ DISTNAME= aiosmtpd-1.4.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -21,7 +21,8 @@ PYTHON_VERSIONS_INCOMPATIBLE= 27 USE_PKG_RESOURCES= yes .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} < 38 + +.if ${PYTHON_VERSION} < 308 DEPENDS+= ${PYPKGPREFIX}-typing-extensions-[0-9]*:../../devel/py-typing-extensions .endif Index: pkgsrc/mail/py-spf/Makefile diff -u pkgsrc/mail/py-spf/Makefile:1.17 pkgsrc/mail/py-spf/Makefile:1.18 --- pkgsrc/mail/py-spf/Makefile:1.17 Tue Aug 23 21:49:56 2022 +++ pkgsrc/mail/py-spf/Makefile Wed Mar 29 09:34:11 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2022/08/23 21:49:56 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2023/03/29 09:34:11 wiz Exp $ DISTNAME= pyspf-2.0.14 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/^py//} @@ -16,7 +16,8 @@ TEST_DEPENDS+= ${PYPKGPREFIX}-yaml-[0-9] PYTHON_VERSIONED_DEPENDENCIES= dns .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} == 27 + +.if ${PYTHON_VERSION} == 207 DEPENDS+= ${PYPKGPREFIX}-ipaddr-[0-9]*:../../devel/py-ipaddr .endif Index: pkgsrc/math/py-asdf/Makefile diff -u pkgsrc/math/py-asdf/Makefile:1.8 pkgsrc/math/py-asdf/Makefile:1.9 --- pkgsrc/math/py-asdf/Makefile:1.8 Mon Aug 29 16:20:19 2022 +++ pkgsrc/math/py-asdf/Makefile Wed Mar 29 09:34:11 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2022/08/29 16:20:19 thor Exp $ +# $NetBSD: Makefile,v 1.9 2023/03/29 09:34:11 wiz Exp $ DISTNAME= asdf-2.11.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -26,7 +26,8 @@ PYTHON_VERSIONS_INCOMPATIBLE= 27 # py-nu USE_PKG_RESOURCES= yes .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} < 39 + +.if ${PYTHON_VERSION} < 309 DEPENDS+= ${PYPKGPREFIX}-importlib-resources>=3:../../devel/py-importlib-resources .endif Index: pkgsrc/math/py-numpy/buildlink3.mk diff -u pkgsrc/math/py-numpy/buildlink3.mk:1.16 pkgsrc/math/py-numpy/buildlink3.mk:1.17 --- pkgsrc/math/py-numpy/buildlink3.mk:1.16 Wed Mar 15 13:48:40 2023 +++ pkgsrc/math/py-numpy/buildlink3.mk Wed Mar 29 09:34:11 2023 @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.16 2023/03/15 13:48:40 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.17 2023/03/29 09:34:11 wiz Exp $ BUILDLINK_TREE+= py-numpy @@ -8,7 +8,7 @@ PY_NUMPY_BUILDLINK3_MK:= .include "../../lang/python/pyversion.mk" BUILDLINK_API_DEPENDS.py-numpy+= ${PYPKGPREFIX}-numpy>=1.0 -.if ${_PYTHON_VERSION} == 27 || ${_PYTHON_VERSION} == 37 +.if ${PYTHON_VERSION} < 308 BUILDLINK_ABI_DEPENDS.py-numpy+= ${PYPKGPREFIX}-numpy>=1.16.6nb3 BUILDLINK_PKGSRCDIR.py-numpy?= ../../math/py-numpy16 .else Index: pkgsrc/misc/py-ansi/Makefile diff -u pkgsrc/misc/py-ansi/Makefile:1.6 pkgsrc/misc/py-ansi/Makefile:1.7 --- pkgsrc/misc/py-ansi/Makefile:1.6 Sun Feb 13 10:07:46 2022 +++ pkgsrc/misc/py-ansi/Makefile Wed Mar 29 09:34:11 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2022/02/13 10:07:46 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2023/03/29 09:34:11 wiz Exp $ DISTNAME= ansi-0.3.6 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -17,7 +17,8 @@ USE_LANGUAGES= # none PYTHON_VERSIONS_INCOMPATIBLE= 27 .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} < 38 + +.if ${PYTHON_VERSION} < 308 DEPENDS+= ${PYPKGPREFIX}-typing-extensions>=3.6.4:../../devel/py-typing-extensions .endif Index: pkgsrc/misc/py-immutables/Makefile diff -u pkgsrc/misc/py-immutables/Makefile:1.9 pkgsrc/misc/py-immutables/Makefile:1.10 --- pkgsrc/misc/py-immutables/Makefile:1.9 Tue Oct 4 09:57:14 2022 +++ pkgsrc/misc/py-immutables/Makefile Wed Mar 29 09:34:11 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2022/10/04 09:57:14 adam Exp $ +# $NetBSD: Makefile,v 1.10 2023/03/29 09:34:11 wiz Exp $ DISTNAME= immutables-0.19 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -17,7 +17,7 @@ PYTHON_VERSIONS_INCOMPATIBLE= 27 .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} == 37 +.if ${PYTHON_VERSION} == 307 DEPENDS+= ${PYPKGPREFIX}-typing-extensions>=3.7.4.3:../../devel/py-typing-extensions .endif Index: pkgsrc/net/py-kombu/Makefile diff -u pkgsrc/net/py-kombu/Makefile:1.34 pkgsrc/net/py-kombu/Makefile:1.35 --- pkgsrc/net/py-kombu/Makefile:1.34 Mon Jul 11 08:43:01 2022 +++ pkgsrc/net/py-kombu/Makefile Wed Mar 29 09:34:12 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2022/07/11 08:43:01 adam Exp $ +# $NetBSD: Makefile,v 1.35 2023/03/29 09:34:12 wiz Exp $ DISTNAME= kombu-5.2.4 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -20,7 +20,8 @@ TEST_DEPENDS+= ${PYPKGPREFIX}-Pyro4-[0-9 PYTHON_VERSIONS_INCOMPATIBLE= 27 .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} < 38 + +.if ${PYTHON_VERSION} < 308 DEPENDS+= ${PYPKGPREFIX}-importlib-metadata>=0.18:../../devel/py-importlib-metadata DEPENDS+= ${PYPKGPREFIX}-cached-property-[0-9]*:../../devel/py-cached-property .endif Index: pkgsrc/net/py-moto/Makefile diff -u pkgsrc/net/py-moto/Makefile:1.10 pkgsrc/net/py-moto/Makefile:1.11 --- pkgsrc/net/py-moto/Makefile:1.10 Wed Nov 2 08:45:29 2022 +++ pkgsrc/net/py-moto/Makefile Wed Mar 29 09:34:12 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2022/11/02 08:45:29 adam Exp $ +# $NetBSD: Makefile,v 1.11 2023/03/29 09:34:12 wiz Exp $ DISTNAME= moto-4.0.9 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -35,7 +35,8 @@ USE_PKG_RESOURCES= yes PYTHON_VERSIONS_INCOMPATIBLE= 27 .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} == 37 + +.if ${PYTHON_VERSION} == 307 DEPENDS+= ${PYPKGPREFIX}-importlib-metadata-[0-9]*:../../devel/py-importlib-metadata .endif Index: pkgsrc/security/py-argon2-cffi/Makefile diff -u pkgsrc/security/py-argon2-cffi/Makefile:1.5 pkgsrc/security/py-argon2-cffi/Makefile:1.6 --- pkgsrc/security/py-argon2-cffi/Makefile:1.5 Tue Jan 4 20:54:37 2022 +++ pkgsrc/security/py-argon2-cffi/Makefile Wed Mar 29 09:34:12 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2022/01/04 20:54:37 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2023/03/29 09:34:12 wiz Exp $ DISTNAME= argon2-cffi-20.1.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -18,7 +18,8 @@ PYTHON_VERSIONED_DEPENDENCIES= test:test PYTHON_VERSIONED_DEPENDENCIES+= hypothesis:test .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} == 27 + +.if ${PYTHON_VERSION} == 207 DEPENDS+= ${PYPKGPREFIX}-enum34-[0-9]*:../../devel/py-enum34 .endif Index: pkgsrc/security/py-cryptodome/Makefile diff -u pkgsrc/security/py-cryptodome/Makefile:1.46 pkgsrc/security/py-cryptodome/Makefile:1.47 --- pkgsrc/security/py-cryptodome/Makefile:1.46 Wed Feb 1 12:16:49 2023 +++ pkgsrc/security/py-cryptodome/Makefile Wed Mar 29 09:34:12 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2023/02/01 12:16:49 adam Exp $ +# $NetBSD: Makefile,v 1.47 2023/03/29 09:34:12 wiz Exp $ DISTNAME= pycryptodome-3.17 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/^py//} @@ -21,7 +21,7 @@ CHECK_PORTABILITY_SKIP= appveyor/get_whe .include "../../lang/python/egg.mk" # Python 3 builds of this package get an extra "abi3" suffix added -.if ${_PYTHON_VERSION} != 27 +.if ${PYTHON_VERSION} == 207 PLIST_SUBST+= SOEXT="abi3.so" .else PLIST_SUBST+= SOEXT="so" Index: pkgsrc/security/py-cryptography/dependency.mk diff -u pkgsrc/security/py-cryptography/dependency.mk:1.2 pkgsrc/security/py-cryptography/dependency.mk:1.3 --- pkgsrc/security/py-cryptography/dependency.mk:1.2 Mon Nov 28 08:49:08 2022 +++ pkgsrc/security/py-cryptography/dependency.mk Wed Mar 29 09:34:12 2023 @@ -1,4 +1,4 @@ -# $NetBSD: dependency.mk,v 1.2 2022/11/28 08:49:08 adam Exp $ +# $NetBSD: dependency.mk,v 1.3 2023/03/29 09:34:12 wiz Exp $ # # Not for public use - use through versioned_dependencies.mk. # @@ -14,7 +14,7 @@ .include "../../mk/bsd.fast.prefs.mk" .include "../../lang/rust/platform.mk" -.if ${PLATFORM_SUPPORTS_RUST:tl} == "yes" && empty(_PYTHON_VERSION:M2*) +.if ${PLATFORM_SUPPORTS_RUST:tl} == "yes" && empty(PYTHON_VERSION:M2*) PYCRYPTOGRAPHY_TYPE?= rust .else PYCRYPTOGRAPHY_TYPE?= c Index: pkgsrc/security/py-signedjson/Makefile diff -u pkgsrc/security/py-signedjson/Makefile:1.7 pkgsrc/security/py-signedjson/Makefile:1.8 --- pkgsrc/security/py-signedjson/Makefile:1.7 Thu Apr 14 20:35:37 2022 +++ pkgsrc/security/py-signedjson/Makefile Wed Mar 29 09:34:12 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2022/04/14 20:35:37 adam Exp $ +# $NetBSD: Makefile,v 1.8 2023/03/29 09:34:12 wiz Exp $ DISTNAME= signedjson-1.1.4 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -18,7 +18,8 @@ BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptool PYTHON_VERSIONS_INCOMPATIBLE= 27 # py-unpaddedbase64 .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION}< 38 + +.if ${PYTHON_VERSION} < 308 DEPENDS+= ${PYPKGPREFIX}-importlib-metadata-[0-9]*:../../devel/py-importlib-metadata DEPENDS+= ${PYPKGPREFIX}-typing-extensions>=3.5:../../devel/py-typing-extensions .endif Index: pkgsrc/security/py-u2f/Makefile diff -u pkgsrc/security/py-u2f/Makefile:1.7 pkgsrc/security/py-u2f/Makefile:1.8 --- pkgsrc/security/py-u2f/Makefile:1.7 Thu May 12 08:15:48 2022 +++ pkgsrc/security/py-u2f/Makefile Wed Mar 29 09:34:12 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2022/05/12 08:15:48 adam Exp $ +# $NetBSD: Makefile,v 1.8 2023/03/29 09:34:12 wiz Exp $ DISTNAME= pyu2f-0.1.5 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//} @@ -20,7 +20,7 @@ USE_LANGUAGES= # none .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} != 27 +.if ${PYTHON_VERSION} != 207 TEST_DEPENDS+= ${PYPKGPREFIX}-fakefs>=2.4:../../devel/py-fakefs .endif Index: pkgsrc/security/py27-cryptography/Makefile diff -u pkgsrc/security/py27-cryptography/Makefile:1.5 pkgsrc/security/py27-cryptography/Makefile:1.6 --- pkgsrc/security/py27-cryptography/Makefile:1.5 Wed Oct 19 13:18:46 2022 +++ pkgsrc/security/py27-cryptography/Makefile Wed Mar 29 09:34:12 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2022/10/19 13:18:46 nia Exp $ +# $NetBSD: Makefile,v 1.6 2023/03/29 09:34:12 wiz Exp $ DISTNAME= cryptography-3.3.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -22,7 +22,8 @@ TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9] TEST_DEPENDS+= ${PYPKGPREFIX}-hypothesis-[0-9]*:../../devel/py-hypothesis4 .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} == 27 + +.if ${PYTHON_VERSION} == 207 DEPENDS+= ${PYPKGPREFIX}-enum34-[0-9]*:../../devel/py-enum34 DEPENDS+= ${PYPKGPREFIX}-ipaddress-[0-9]*:../../net/py-ipaddress .endif Index: pkgsrc/sysutils/py-structlog/Makefile diff -u pkgsrc/sysutils/py-structlog/Makefile:1.16 pkgsrc/sysutils/py-structlog/Makefile:1.17 --- pkgsrc/sysutils/py-structlog/Makefile:1.16 Sat Apr 30 11:11:01 2022 +++ pkgsrc/sysutils/py-structlog/Makefile Wed Mar 29 09:34:13 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2022/04/30 11:11:01 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2023/03/29 09:34:13 wiz Exp $ DISTNAME= structlog-21.5.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -25,7 +25,7 @@ PYTHON_VERSIONS_INCOMPATIBLE= 27 .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} < 38 +.if ${PYTHON_VERSION} < 308 DEPENDS+= ${PYPKGPREFIX}-typing-extensions-[0-9]*:../../devel/py-typing-extensions .endif Index: pkgsrc/sysutils/py-supervisor/Makefile diff -u pkgsrc/sysutils/py-supervisor/Makefile:1.13 pkgsrc/sysutils/py-supervisor/Makefile:1.14 --- pkgsrc/sysutils/py-supervisor/Makefile:1.13 Thu Dec 29 12:35:41 2022 +++ pkgsrc/sysutils/py-supervisor/Makefile Wed Mar 29 09:34:13 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2022/12/29 12:35:41 adam Exp $ +# $NetBSD: Makefile,v 1.14 2023/03/29 09:34:13 wiz Exp $ DISTNAME= supervisor-4.2.5 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -13,7 +13,8 @@ LICENSE= original-bsd DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} == 27 + +.if ${PYTHON_VERSION} == 207 TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock .endif Index: pkgsrc/textproc/py-black/Makefile diff -u pkgsrc/textproc/py-black/Makefile:1.13 pkgsrc/textproc/py-black/Makefile:1.14 --- pkgsrc/textproc/py-black/Makefile:1.13 Mon Feb 20 17:59:00 2023 +++ pkgsrc/textproc/py-black/Makefile Wed Mar 29 09:34:13 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2023/02/20 17:59:00 adam Exp $ +# $NetBSD: Makefile,v 1.14 2023/03/29 09:34:13 wiz Exp $ DISTNAME= black-23.1.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -28,10 +28,10 @@ USE_LANGUAGES= # none PYTHON_VERSIONS_INCOMPATIBLE= 27 .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} != 311 +.if ${PYTHON_VERSION} < 311 DEPENDS+= ${PYPKGPREFIX}-tomli>=1.1.0:../../textproc/py-tomli .endif -.if ${_PYTHON_VERSION} == 38 || ${_PYTHON_VERSION} == 39 +.if ${PYTHON_VERSION} < 310 DEPENDS+= ${PYPKGPREFIX}-typing-extensions>=3.10.0.0:../../devel/py-typing-extensions .endif Index: pkgsrc/textproc/py-cmudict/Makefile diff -u pkgsrc/textproc/py-cmudict/Makefile:1.6 pkgsrc/textproc/py-cmudict/Makefile:1.7 --- pkgsrc/textproc/py-cmudict/Makefile:1.6 Thu Mar 16 00:11:52 2023 +++ pkgsrc/textproc/py-cmudict/Makefile Wed Mar 29 09:34:13 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2023/03/16 00:11:52 gutteridge Exp $ +# $NetBSD: Makefile,v 1.7 2023/03/29 09:34:13 wiz Exp $ DISTNAME= cmudict-1.0.12 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -17,8 +17,10 @@ PYTHON_VERSIONS_INCOMPATIBLE= 27 # The upstream project lists higher minimums for these depenencies, but that # is incorrect. What's recorded below are correct minimums for the actual # functionality required. This has been tested with Python 3.8 and 3.9. + .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} == 38 || ${_PYTHON_VERSION} == 39 + +.if ${PYTHON_VERSION } < 310 DEPENDS+= ${PYPKGPREFIX}-importlib-metadata>=4.6:../../devel/py-importlib-metadata DEPENDS+= ${PYPKGPREFIX}-importlib-resources>=5.0:../../devel/py-importlib-resources .endif Index: pkgsrc/textproc/py-commonmark/Makefile diff -u pkgsrc/textproc/py-commonmark/Makefile:1.4 pkgsrc/textproc/py-commonmark/Makefile:1.5 --- pkgsrc/textproc/py-commonmark/Makefile:1.4 Wed Jan 5 15:41:23 2022 +++ pkgsrc/textproc/py-commonmark/Makefile Wed Mar 29 09:34:13 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2022/01/05 15:41:23 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2023/03/29 09:34:13 wiz Exp $ DISTNAME= commonmark-0.9.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} @@ -12,7 +12,8 @@ COMMENT= Python parser for the CommonMar LICENSE= modified-bsd .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} == 27 + +.if ${PYTHON_VERSION} == 207 DEPENDS+= ${PYPKGPREFIX}-future>=0.14.0:../../devel/py-future .endif Index: pkgsrc/textproc/py-diff-match-patch/Makefile diff -u pkgsrc/textproc/py-diff-match-patch/Makefile:1.5 pkgsrc/textproc/py-diff-match-patch/Makefile:1.6 --- pkgsrc/textproc/py-diff-match-patch/Makefile:1.5 Tue Jan 4 20:54:54 2022 +++ pkgsrc/textproc/py-diff-match-patch/Makefile Wed Mar 29 09:34:13 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2022/01/04 20:54:54 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2023/03/29 09:34:13 wiz Exp $ DISTNAME= diff-match-patch-20200713 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -17,7 +17,7 @@ USE_LANGUAGES= # none .include "../../lang/python/pyversion.mk" do-test: -.if ${_PYTHON_VERSION} == 27 +.if ${PYTHON_VERSION} == 207 cd ${WRKSRC} && ${PYTHONBIN} diff_match_patch/tests/diff_match_patch_test_py2.py .else cd ${WRKSRC} && ${PYTHONBIN} diff_match_patch/tests/diff_match_patch_test.py Index: pkgsrc/textproc/py-jaraco.text/Makefile diff -u pkgsrc/textproc/py-jaraco.text/Makefile:1.3 pkgsrc/textproc/py-jaraco.text/Makefile:1.4 --- pkgsrc/textproc/py-jaraco.text/Makefile:1.3 Thu Feb 9 09:25:22 2023 +++ pkgsrc/textproc/py-jaraco.text/Makefile Wed Mar 29 09:34:13 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2023/02/09 09:25:22 adam Exp $ +# $NetBSD: Makefile,v 1.4 2023/03/29 09:34:13 wiz Exp $ DISTNAME= jaraco.text-3.11.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -21,8 +21,10 @@ DEPENDS+= ${PYPKGPREFIX}-more-itertools- USE_LANGUAGES= # none PYTHON_VERSIONS_INCOMPATIBLE= 27 + .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} == 38 + +.if ${PYTHON_VERSION} < 309 DEPENDS+= ${PYPKGPREFIX}-importlib-resources-[0-9]*:../../devel/py-importlib-resources .endif Index: pkgsrc/textproc/py-jsonpickle/Makefile diff -u pkgsrc/textproc/py-jsonpickle/Makefile:1.13 pkgsrc/textproc/py-jsonpickle/Makefile:1.14 --- pkgsrc/textproc/py-jsonpickle/Makefile:1.13 Wed Aug 24 08:41:09 2022 +++ pkgsrc/textproc/py-jsonpickle/Makefile Wed Mar 29 09:34:13 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2022/08/24 08:41:09 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2023/03/29 09:34:13 wiz Exp $ DISTNAME= jsonpickle-2.0.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -12,8 +12,10 @@ COMMENT= Python library for serializing LICENSE= modified-bsd TEST_DEPENDS+= ${PYPKGPREFIX}-test-flake8-[0-9]*:../../devel/py-test-flake8 + .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} < 38 + +.if ${PYTHON_VERSION} < 308 PYTHON_VERSIONED_DEPENDENCIES+= importlib-metadata .endif Index: pkgsrc/textproc/py-jsonschema/Makefile diff -u pkgsrc/textproc/py-jsonschema/Makefile:1.32 pkgsrc/textproc/py-jsonschema/Makefile:1.33 --- pkgsrc/textproc/py-jsonschema/Makefile:1.32 Mon Dec 19 08:22:10 2022 +++ pkgsrc/textproc/py-jsonschema/Makefile Wed Mar 29 09:34:13 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2022/12/19 08:22:10 adam Exp $ +# $NetBSD: Makefile,v 1.33 2023/03/29 09:34:13 wiz Exp $ DISTNAME= jsonschema-4.17.3 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -23,7 +23,8 @@ USE_LANGUAGES= # none PYTHON_VERSIONS_INCOMPATIBLE= 27 .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} < 39 + +.if ${PYTHON_VERSION} < 309 DEPENDS+= ${PYPKGPREFIX}-importlib-resources>=1.4.0:../../devel/py-importlib-resources DEPENDS+= ${PYPKGPREFIX}-pkgutil_resolve_name>=1.3.10:../../devel/py-pkgutil_resolve_name .endif Index: pkgsrc/textproc/py-markdown/Makefile diff -u pkgsrc/textproc/py-markdown/Makefile:1.27 pkgsrc/textproc/py-markdown/Makefile:1.28 --- pkgsrc/textproc/py-markdown/Makefile:1.27 Wed Nov 9 13:14:17 2022 +++ pkgsrc/textproc/py-markdown/Makefile Wed Mar 29 09:34:14 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2022/11/09 13:14:17 joerg Exp $ +# $NetBSD: Makefile,v 1.28 2023/03/29 09:34:14 wiz Exp $ DISTNAME= Markdown-3.4.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} @@ -19,7 +19,8 @@ USE_PKG_RESOURCES= yes PYTHON_VERSIONS_INCOMPATIBLE= 27 .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} < 310 + +.if ${PYTHON_VERSION} < 310 DEPENDS+= ${PYPKGPREFIX}-importlib-metadata>=4.4.0:../../devel/py-importlib-metadata .endif Index: pkgsrc/textproc/py-markups/Makefile diff -u pkgsrc/textproc/py-markups/Makefile:1.10 pkgsrc/textproc/py-markups/Makefile:1.11 --- pkgsrc/textproc/py-markups/Makefile:1.10 Sun Mar 12 03:00:57 2023 +++ pkgsrc/textproc/py-markups/Makefile Wed Mar 29 09:34:14 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2023/03/12 03:00:57 gutteridge Exp $ +# $NetBSD: Makefile,v 1.11 2023/03/29 09:34:14 wiz Exp $ # (4.0.0 drops support for Python < 3.9.) DISTNAME= Markups-3.1.3 @@ -22,7 +22,8 @@ USE_LANGUAGES= # none PYTHON_VERSIONS_INCOMPATIBLE= 27 .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} < 38 + +.if ${PYTHON_VERSION} < 308 DEPENDS+= ${PYPKGPREFIX}-importlib-metadata-[0-9]*:../../devel/py-importlib-metadata .endif Index: pkgsrc/textproc/py-pallets-sphinx-themes/Makefile diff -u pkgsrc/textproc/py-pallets-sphinx-themes/Makefile:1.9 pkgsrc/textproc/py-pallets-sphinx-themes/Makefile:1.10 --- pkgsrc/textproc/py-pallets-sphinx-themes/Makefile:1.9 Fri Apr 29 13:38:26 2022 +++ pkgsrc/textproc/py-pallets-sphinx-themes/Makefile Wed Mar 29 09:34:14 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2022/04/29 13:38:26 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2023/03/29 09:34:14 wiz Exp $ DISTNAME= Pallets-Sphinx-Themes-2.0.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} @@ -19,7 +19,7 @@ PYTHON_VERSIONS_INCOMPATIBLE= 27 .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} < 38 +.if ${PYTHON_VERSION} < 308 DEPENDS+= ${PYPKGPREFIX}-importlib-metadata-[0-9]*:../../devel/py-importlib-metadata .endif Index: pkgsrc/textproc/py-sphinx/Makefile diff -u pkgsrc/textproc/py-sphinx/Makefile:1.87 pkgsrc/textproc/py-sphinx/Makefile:1.88 --- pkgsrc/textproc/py-sphinx/Makefile:1.87 Tue Oct 25 18:36:42 2022 +++ pkgsrc/textproc/py-sphinx/Makefile Wed Mar 29 09:34:14 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.87 2022/10/25 18:36:42 adam Exp $ +# $NetBSD: Makefile,v 1.88 2023/03/29 09:34:14 wiz Exp $ DISTNAME= Sphinx-5.3.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} @@ -39,7 +39,8 @@ PYSETUPTESTTARGET= pytest PYTHON_VERSIONS_INCOMPATIBLE= 27 .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} < 310 + +.if ${PYTHON_VERSION} < 310 DEPENDS+= ${PYPKGPREFIX}-importlib-metadata>=4.8.0:../../devel/py-importlib-metadata .endif Index: pkgsrc/textproc/py-validate-pyproject/Makefile diff -u pkgsrc/textproc/py-validate-pyproject/Makefile:1.4 pkgsrc/textproc/py-validate-pyproject/Makefile:1.5 --- pkgsrc/textproc/py-validate-pyproject/Makefile:1.4 Tue Aug 2 11:16:48 2022 +++ pkgsrc/textproc/py-validate-pyproject/Makefile Wed Mar 29 09:34:14 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2022/08/02 11:16:48 adam Exp $ +# $NetBSD: Makefile,v 1.5 2023/03/29 09:34:14 wiz Exp $ DISTNAME= validate-pyproject-0.9 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -23,7 +23,7 @@ PYTHON_VERSIONS_INCOMPATIBLE= 27 .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} == 37 +.if ${PYTHON_VERSION} < 308 DEPENDS+= ${PYPKGPREFIX}-importlib-metadata>0:../../devel/py-importlib-metadata .endif Index: pkgsrc/time/py-aniso8601/Makefile diff -u pkgsrc/time/py-aniso8601/Makefile:1.9 pkgsrc/time/py-aniso8601/Makefile:1.10 --- pkgsrc/time/py-aniso8601/Makefile:1.9 Tue Jan 4 20:55:10 2022 +++ pkgsrc/time/py-aniso8601/Makefile Wed Mar 29 09:34:14 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2022/01/04 20:55:10 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2023/03/29 09:34:14 wiz Exp $ DISTNAME= aniso8601-9.0.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -12,7 +12,8 @@ COMMENT= Library for parsing ISO 8601 st LICENSE= modified-bsd .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} == 27 + +.if ${PYTHON_VERSION} == 207 TEST_DEPENDS+= ${PYPKGPREFIX}-mock>=2.0.0:../../devel/py-mock .endif Index: pkgsrc/time/py-arrow/Makefile diff -u pkgsrc/time/py-arrow/Makefile:1.21 pkgsrc/time/py-arrow/Makefile:1.22 --- pkgsrc/time/py-arrow/Makefile:1.21 Mon Sep 5 13:25:48 2022 +++ pkgsrc/time/py-arrow/Makefile Wed Mar 29 09:34:14 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2022/09/05 13:25:48 adam Exp $ +# $NetBSD: Makefile,v 1.22 2023/03/29 09:34:14 wiz Exp $ DISTNAME= arrow-1.2.3 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -26,7 +26,8 @@ PYSETUPTESTTARGET= pytest PYTHON_VERSIONS_INCOMPATIBLE= 27 .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} == 37 + +.if ${PYTHON_VERSION} < 308 DEPENDS+= ${PYPKGPREFIX}-typing-extensions-[0-9]*:../../devel/py-typing-extensions .endif Index: pkgsrc/time/py-dateutil/Makefile diff -u pkgsrc/time/py-dateutil/Makefile:1.35 pkgsrc/time/py-dateutil/Makefile:1.36 --- pkgsrc/time/py-dateutil/Makefile:1.35 Sat Nov 5 22:31:42 2022 +++ pkgsrc/time/py-dateutil/Makefile Wed Mar 29 09:34:14 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2022/11/05 22:31:42 joerg Exp $ +# $NetBSD: Makefile,v 1.36 2023/03/29 09:34:14 wiz Exp $ DISTNAME= python-dateutil-2.8.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/python-//} @@ -15,7 +15,7 @@ DEPENDS+= ${PYPKGPREFIX}-six>=1.5:../../ .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} != 27 +.if ${PYTHON_VERSION} != 207 # freezegun is only available for python 3 TEST_DEPENDS+= ${PYPKGPREFIX}-freezegun-[0-9]*:../../devel/py-freezegun .endif Index: pkgsrc/time/py-pendulum/Makefile diff -u pkgsrc/time/py-pendulum/Makefile:1.16 pkgsrc/time/py-pendulum/Makefile:1.17 --- pkgsrc/time/py-pendulum/Makefile:1.16 Tue Jan 4 20:55:12 2022 +++ pkgsrc/time/py-pendulum/Makefile Wed Mar 29 09:34:15 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2022/01/04 20:55:12 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2023/03/29 09:34:15 wiz Exp $ DISTNAME= pendulum-2.1.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -15,7 +15,8 @@ DEPENDS+= ${PYPKGPREFIX}-dateutil>=2.6.0 DEPENDS+= ${PYPKGPREFIX}-tzdata>=2018.3:../../time/py-tzdata .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} == 27 + +.if ${PYTHON_VERSION} == 207 DEPENDS+= ${PYPKGPREFIX}-typing>=3.6:../../devel/py-typing .endif Index: pkgsrc/www/py-flask/Makefile diff -u pkgsrc/www/py-flask/Makefile:1.27 pkgsrc/www/py-flask/Makefile:1.28 --- pkgsrc/www/py-flask/Makefile:1.27 Thu Mar 2 12:42:47 2023 +++ pkgsrc/www/py-flask/Makefile Wed Mar 29 09:34:15 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2023/03/02 12:42:47 adam Exp $ +# $NetBSD: Makefile,v 1.28 2023/03/29 09:34:15 wiz Exp $ DISTNAME= Flask-2.2.3 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} @@ -20,7 +20,7 @@ PYTHON_VERSIONS_INCOMPATIBLE= 27 .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} < 310 +.if ${PYTHON_VERSION} < 310 DEPENDS+= ${PYPKGPREFIX}-importlib-metadata>=3.6.0:../../devel/py-importlib-metadata .endif Index: pkgsrc/www/py-h11/Makefile diff -u pkgsrc/www/py-h11/Makefile:1.11 pkgsrc/www/py-h11/Makefile:1.12 --- pkgsrc/www/py-h11/Makefile:1.11 Tue Oct 18 08:50:08 2022 +++ pkgsrc/www/py-h11/Makefile Wed Mar 29 09:34:15 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2022/10/18 08:50:08 adam Exp $ +# $NetBSD: Makefile,v 1.12 2023/03/29 09:34:15 wiz Exp $ DISTNAME= h11-0.14.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -15,7 +15,8 @@ USE_LANGUAGES= # none PYTHON_VERSIONS_INCOMPATIBLE= 27 .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} < 38 + +.if ${PYTHON_VERSION} < 308 DEPENDS+= ${PYPKGPREFIX}-typing-extensions>0:../../devel/py-typing-extensions .endif Index: pkgsrc/www/py-httpie/Makefile diff -u pkgsrc/www/py-httpie/Makefile:1.14 pkgsrc/www/py-httpie/Makefile:1.15 --- pkgsrc/www/py-httpie/Makefile:1.14 Tue Oct 25 07:59:07 2022 +++ pkgsrc/www/py-httpie/Makefile Wed Mar 29 09:34:15 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2022/10/25 07:59:07 adam Exp $ +# $NetBSD: Makefile,v 1.15 2023/03/29 09:34:15 wiz Exp $ DISTNAME= httpie-3.2.1 PKGNAME= ${PYPKGPREFIX}-${EGG_NAME} @@ -33,7 +33,7 @@ PYTHON_VERSIONS_INCOMPATIBLE= 27 .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} == 37 +.if ${PYTHON_VERSION} == 307 DEPENDS+= ${PYPKGPREFIX}-importlib-metadata>=1.4.0:../../devel/py-importlib-metadata .endif Index: pkgsrc/www/py-hyperlink/Makefile diff -u pkgsrc/www/py-hyperlink/Makefile:1.13 pkgsrc/www/py-hyperlink/Makefile:1.14 --- pkgsrc/www/py-hyperlink/Makefile:1.13 Tue Jun 28 11:37:49 2022 +++ pkgsrc/www/py-hyperlink/Makefile Wed Mar 29 09:34:15 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2022/06/28 11:37:49 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2023/03/29 09:34:15 wiz Exp $ DISTNAME= hyperlink-21.0.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -12,8 +12,10 @@ COMMENT= Featureful, correct URL for Pyt LICENSE= modified-bsd DEPENDS+= ${PYPKGPREFIX}-idna>=2.5:../../www/py-idna + .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} == 27 + +.if ${PYTHON_VERSION} == 207 DEPENDS+= ${PYPKGPREFIX}-typing-[0-9]*:../../devel/py-typing .endif Index: pkgsrc/www/py-test-django/Makefile diff -u pkgsrc/www/py-test-django/Makefile:1.22 pkgsrc/www/py-test-django/Makefile:1.23 --- pkgsrc/www/py-test-django/Makefile:1.22 Thu Jan 13 19:31:25 2022 +++ pkgsrc/www/py-test-django/Makefile Wed Mar 29 09:34:15 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2022/01/13 19:31:25 wiz Exp $ +# $NetBSD: Makefile,v 1.23 2023/03/29 09:34:15 wiz Exp $ DISTNAME= pytest-django-3.10.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/^py//} @@ -12,7 +12,8 @@ COMMENT= Django plugin for pytest LICENSE= modified-bsd .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} == 27 + +.if ${PYTHON_VERSION} == 207 DEPENDS+= ${PYPKGPREFIX}-pathlib2-[0-9]*:../../devel/py-pathlib2 .endif Index: pkgsrc/www/py-uvicorn/Makefile diff -u pkgsrc/www/py-uvicorn/Makefile:1.32 pkgsrc/www/py-uvicorn/Makefile:1.33 --- pkgsrc/www/py-uvicorn/Makefile:1.32 Thu Sep 8 15:23:23 2022 +++ pkgsrc/www/py-uvicorn/Makefile Wed Mar 29 09:34:15 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2022/09/08 15:23:23 adam Exp $ +# $NetBSD: Makefile,v 1.33 2023/03/29 09:34:15 wiz Exp $ DISTNAME= uvicorn-0.18.3 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -24,7 +24,8 @@ PYTHON_VERSIONS_INCOMPATIBLE= 27 USE_PKG_RESOURCES= yes .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} < 38 + +.if ${PYTHON_VERSION} < 308 DEPENDS+= ${PYPKGPREFIX}-typing-extensions-[0-9]*:../../devel/py-typing-extensions .endif Index: pkgsrc/www/py-uwsgitop/Makefile diff -u pkgsrc/www/py-uwsgitop/Makefile:1.12 pkgsrc/www/py-uwsgitop/Makefile:1.13 --- pkgsrc/www/py-uwsgitop/Makefile:1.12 Tue Jan 4 20:55:37 2022 +++ pkgsrc/www/py-uwsgitop/Makefile Wed Mar 29 09:34:15 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2022/01/04 20:55:37 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2023/03/29 09:34:15 wiz Exp $ DISTNAME= uwsgitop-0.11 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -14,7 +14,8 @@ LICENSE= mit DEPENDS+= ${PYPKGPREFIX}-curses-[0-9]*:../../devel/py-curses .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} == 27 + +.if ${PYTHON_VERSION} == 207 DEPENDS+= ${PYPKGPREFIX}-argparse-[0-9]*:../../devel/py-argparse .endif --_----------=_1680082457156590--