On Mon, Mar 01, 2021 at 09:56:22AM -0600, Lucas Raab wrote:
> Hello,
>
> Following up on the py3 conversion for flask, here's a similar diff for
> devel/py-click. py-flask was the last py2 consumer of click (outside of
> the other click-related packages anyway). Now that flask is clear, onto
> click itself.
>
> * py-click reverse deps
> * devel/py-click-log
> * devel/py-click-plugins
> * devel/py-click-threading
> * devel/py-spark-parser
> * devel/py-xdis
>
> devel/py-uncompyle6 has run depends on:
> * devel/py-spark-parser
> * devel/py-xdis
>
> Look okay?
>
> cc: py-click-log maintainer
makes sense to me. OK
py3-click-log is used by productivity/vdirsyncer which is py3.
Remi
>
> Lucas
> diff adb2f64673ba41fa09f2a8be93386abe3acf033c /usr/ports
> blob - a6648d555c278ecae9a91fa5ab05045b5bb95966
> file + devel/Makefile
> --- devel/Makefile
> +++ devel/Makefile
> @@ -1405,13 +1405,9 @@
> SUBDIR += py-characteristic,python3
> SUBDIR += py-cheetah
> SUBDIR += py-cheetah,python3
> - SUBDIR += py-click
> SUBDIR += py-click,python3
> - SUBDIR += py-click-log
> SUBDIR += py-click-log,python3
> - SUBDIR += py-click-plugins
> SUBDIR += py-click-plugins,python3
> - SUBDIR += py-click-threading
> SUBDIR += py-click-threading,python3
> SUBDIR += py-clint
> SUBDIR += py-clint,python3
> @@ -1689,7 +1685,6 @@
> SUBDIR += py-smmap,python3
> SUBDIR += py-sortedcontainers
> SUBDIR += py-sortedcontainers,python3
> - SUBDIR += py-spark-parser
> SUBDIR += py-spark-parser,python3
> SUBDIR += py-stdnum
> SUBDIR += py-stdnum,python3
> @@ -1746,7 +1741,6 @@
> SUBDIR += py-tz
> SUBDIR += py-tz,python3
> SUBDIR += py-tzlocal,python3
> - SUBDIR += py-uncompyle6
> SUBDIR += py-uncompyle6,python3
> SUBDIR += py-unicorn,python3
> SUBDIR += py-unittest2
> blob - 1159acf174dd19d9006854a91d198a9c1de49a5e
> file + devel/py-click/Makefile
> --- devel/py-click/Makefile
> +++ devel/py-click/Makefile
> @@ -5,7 +5,7 @@ COMMENT= command line library for Python
> MODPY_EGG_VERSION=6.7
> DISTNAME= click-${MODPY_EGG_VERSION}
> PKGNAME= py-click-${MODPY_EGG_VERSION}
> -REVISION= 2
> +REVISION= 3
>
> CATEGORIES= devel
>
> @@ -22,6 +22,6 @@ MODPY_SETUPTOOLS= Yes
> MODPY_PYTEST= Yes
>
> FLAVORS= python3
> -FLAVOR?=
> +FLAVOR= python3
>
> .include <bsd.port.mk>
> blob - b820a1c41288d81a5aed81e898779dd379f6e10e
> file + devel/py-click/pkg/PLIST
> --- devel/py-click/pkg/PLIST
> +++ devel/py-click/pkg/PLIST
> @@ -1,4 +1,5 @@
> @comment $OpenBSD: PLIST,v 1.2 2016/06/08 17:16:46 danj Exp $
> +@pkgpath devel/py-click
> lib/python${MODPY_VERSION}/site-packages/click/
>
> lib/python${MODPY_VERSION}/site-packages/click-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
>
> lib/python${MODPY_VERSION}/site-packages/click-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
> blob - 4e65056f8877304cab1cdf904714d47f99820c2d
> file + devel/py-click-log/Makefile
> --- devel/py-click-log/Makefile
> +++ devel/py-click-log/Makefile
> @@ -5,7 +5,7 @@ COMMENT = logging integration for Python click
> MODPY_EGG_VERSION = 0.3.2
> DISTNAME = click-log-${MODPY_EGG_VERSION}
> PKGNAME = py-${DISTNAME}
> -REVISION = 1
> +REVISION = 2
>
> CATEGORIES = devel
>
> @@ -25,6 +25,6 @@ MODPY_SETUPTOOLS = Yes
> MODPY_PYTEST = Yes
>
> FLAVORS = python3
> -FLAVOR ?=
> +FLAVOR = python3
>
> .include <bsd.port.mk>
> blob - 1961da69b7c5c7fee180a285abc2b96ccc4e4afb
> file + devel/py-click-log/pkg/PLIST
> --- devel/py-click-log/pkg/PLIST
> +++ devel/py-click-log/pkg/PLIST
> @@ -1,4 +1,5 @@
> @comment $OpenBSD: PLIST,v 1.2 2018/08/11 09:26:32 remi Exp $
> +@pkgpath devel/py-click-log
> lib/python${MODPY_VERSION}/site-packages/click_log/
>
> lib/python${MODPY_VERSION}/site-packages/click_log-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
>
> lib/python${MODPY_VERSION}/site-packages/click_log-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
> @@ -9,7 +10,7 @@ lib/python${MODPY_VERSION}/site-packages/click_log-${M
> lib/python${MODPY_VERSION}/site-packages/click_log/__init__.py
>
> ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/click_log/${MODPY_PYCACHE}/
>
> lib/python${MODPY_VERSION}/site-packages/click_log/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/click_log/core.py
>
> lib/python${MODPY_VERSION}/site-packages/click_log/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/click_log/options.py
>
> lib/python${MODPY_VERSION}/site-packages/click_log/${MODPY_PYCACHE}options.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/click_log/core.py
> +lib/python${MODPY_VERSION}/site-packages/click_log/options.py
> blob - 01ca37dc3fbc02fe61fdd561c60eeafbc99ba6a0
> file + devel/py-click-plugins/Makefile
> --- devel/py-click-plugins/Makefile
> +++ devel/py-click-plugins/Makefile
> @@ -5,7 +5,7 @@ COMMENT = register CLI commands via setuptools
> entry-
> MODPY_EGG_VERSION = 1.0.4
> DISTNAME = click-plugins-${MODPY_EGG_VERSION}
> PKGNAME = py-${DISTNAME}
> -REVISION = 1
> +REVISION = 2
>
> CATEGORIES = devel
>
> @@ -23,6 +23,6 @@ MODPY_SETUPTOOLS = Yes
> MODPY_PYTEST = Yes
>
> FLAVORS = python3
> -FLAVOR ?=
> +FLAVOR = python3
>
> .include <bsd.port.mk>
> blob - 633fe121ff0f33bd3bef4970bcd537627aa59ce2
> file + devel/py-click-plugins/pkg/PLIST
> --- devel/py-click-plugins/pkg/PLIST
> +++ devel/py-click-plugins/pkg/PLIST
> @@ -1,4 +1,5 @@
> @comment $OpenBSD: PLIST,v 1.1.1.1 2018/02/25 13:08:47 landry Exp $
> +@pkgpath devel/py-click-plugins
> lib/python${MODPY_VERSION}/site-packages/click_plugins/
>
> lib/python${MODPY_VERSION}/site-packages/click_plugins-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
>
> lib/python${MODPY_VERSION}/site-packages/click_plugins-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
> blob - 66c8d76e22b5abdaecdfbba905a912a4552d1071
> file + devel/py-click-threading/Makefile
> --- devel/py-click-threading/Makefile
> +++ devel/py-click-threading/Makefile
> @@ -5,7 +5,7 @@ COMMENT = multithreading in Python click
> MODPY_EGG_VERSION = 0.4.3
> DISTNAME = click-threading-${MODPY_EGG_VERSION}
> PKGNAME = py-${DISTNAME}
> -REVISION = 1
> +REVISION = 2
>
> CATEGORIES = devel
>
> @@ -22,6 +22,6 @@ MODPY_PI = Yes
> MODPY_SETUPTOOLS = Yes
>
> FLAVORS = python3
> -FLAVOR ?=
> +FLAVOR = python3
>
> .include <bsd.port.mk>
> blob - c23ac0fc9c6cb96c8efe475b5e15bf27822a3361
> file + devel/py-click-threading/pkg/PLIST
> --- devel/py-click-threading/pkg/PLIST
> +++ devel/py-click-threading/pkg/PLIST
> @@ -1,4 +1,5 @@
> @comment $OpenBSD: PLIST,v 1.1.1.1 2017/03/08 02:42:34 danj Exp $
> +@pkgpath devel/py-click-threading
> lib/python${MODPY_VERSION}/site-packages/click_threading/
>
> lib/python${MODPY_VERSION}/site-packages/click_threading-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
>
> lib/python${MODPY_VERSION}/site-packages/click_threading-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
> blob - edc960d4e68850d9102342163b7a4898968af591
> file + devel/py-spark-parser/Makefile
> --- devel/py-spark-parser/Makefile
> +++ devel/py-spark-parser/Makefile
> @@ -6,7 +6,7 @@ MODPY_EGG_VERSION = 1.6.1
> DISTNAME = spark_parser-${MODPY_EGG_VERSION}
> PKGNAME = py-spark-parser-${MODPY_EGG_VERSION}
> CATEGORIES = devel
> -REVISION = 4
> +REVISION = 5
>
> HOMEPAGE = https://github.com/rocky/python-spark/
>
> @@ -23,9 +23,6 @@ MODPY_PYTEST_ARGS = test
> RUN_DEPENDS = devel/py-click${MODPY_FLAVOR}
>
> FLAVORS = python3
> -FLAVOR ?=
> +FLAVOR = python3
>
> -post-install:
> - mv ${PREFIX}/bin/spark-parser-coverage{,${MODPY_BIN_SUFFIX}}
> -
> .include <bsd.port.mk>
> blob - e634e491783d67efd7190c9b17185e71fc1cc933
> file + devel/py-spark-parser/pkg/PLIST
> --- devel/py-spark-parser/pkg/PLIST
> +++ devel/py-spark-parser/pkg/PLIST
> @@ -1,6 +1,7 @@
> @comment $OpenBSD: PLIST,v 1.3 2021/02/19 23:13:02 sthen Exp $
> @conflict py-spark-parser-<1.6.1p4
> -bin/spark-parser-coverage${MODPY_BIN_SUFFIX}
> +@pkgpath devel/py-spark-parser
> +bin/spark-parser-coverage
> lib/python${MODPY_VERSION}/site-packages/spark_parser/
>
> lib/python${MODPY_VERSION}/site-packages/spark_parser-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
>
> lib/python${MODPY_VERSION}/site-packages/spark_parser-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
> blob - 23ce94e1c92d6b72437bf3a360eb19943a4be41a
> file + devel/py-uncompyle6/Makefile
> --- devel/py-uncompyle6/Makefile
> +++ devel/py-uncompyle6/Makefile
> @@ -6,7 +6,7 @@ MODPY_EGG_VERSION = 2.11.0
> DISTNAME = uncompyle6-${MODPY_EGG_VERSION}
> PKGNAME = py-uncompyle6-${MODPY_EGG_VERSION}
> CATEGORIES = devel
> -REVISION = 3
> +REVISION = 4
>
> HOMEPAGE = https://github.com/rocky/python-uncompyle6/
>
> @@ -23,12 +23,8 @@ MODPY_PI = Yes
> MODPY_SETUPTOOLS = Yes
>
> FLAVORS = python3
> -FLAVOR ?=
> +FLAVOR = python3
>
> NO_TEST = Yes
>
> -post-install:
> - mv ${PREFIX}/bin/pydisassemble{,${MODPY_BIN_SUFFIX}}
> - mv ${PREFIX}/bin/uncompyle6{,${MODPY_BIN_SUFFIX}}
> -
> .include <bsd.port.mk>
> blob - 736d7e7566054499576a11faf528101652d35116
> file + devel/py-uncompyle6/pkg/PLIST
> --- devel/py-uncompyle6/pkg/PLIST
> +++ devel/py-uncompyle6/pkg/PLIST
> @@ -1,7 +1,8 @@
> @comment $OpenBSD: PLIST,v 1.12 2021/02/19 23:13:03 sthen Exp $
> @conflict py-uncompyle6-<2.11.0p3
> -bin/pydisassemble${MODPY_BIN_SUFFIX}
> -bin/uncompyle6${MODPY_BIN_SUFFIX}
> +@pkgpath devel/py-uncompyle6
> +bin/pydisassemble
> +bin/uncompyle6
> lib/python${MODPY_VERSION}/site-packages/uncompyle6/
>
> lib/python${MODPY_VERSION}/site-packages/uncompyle6-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
>
> lib/python${MODPY_VERSION}/site-packages/uncompyle6-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
> blob - 5f7e0aabb0b57beb0e95c088ce9656d1fb2b5b3a
> file + devel/py-xdis/Makefile
> --- devel/py-xdis/Makefile
> +++ devel/py-xdis/Makefile
> @@ -6,7 +6,7 @@ MODPY_EGG_VERSION = 3.6.11
> DISTNAME = xdis-${MODPY_EGG_VERSION}
> PKGNAME = py-xdis-${MODPY_EGG_VERSION}
> CATEGORIES = devel
> -REVISION = 3
> +REVISION = 4
>
> HOMEPAGE = https://github.com/rocky/python-xdis/
>
> @@ -25,13 +25,7 @@ TEST_DEPENDS = devel/py-six${MODPY_FLAVOR} \
> devel/py-test${MODPY_FLAVOR}
>
> FLAVORS = python3
> -FLAVOR ?=
> +FLAVOR = python3
>
> -.if !${FLAVOR:Mpython3}
> -TEST_DEPENDS += lang/python/${MODPY_VERSION},-tests
> -.endif
>
> -post-install:
> - mv ${PREFIX}/bin/pydisasm{,${MODPY_BIN_SUFFIX}}
> -
> .include <bsd.port.mk>
> blob - ae3db7b5e7816540c56a12c912bbe828eaaf6fe5
> file + devel/py-xdis/pkg/PLIST
> --- devel/py-xdis/pkg/PLIST
> +++ devel/py-xdis/pkg/PLIST
> @@ -1,6 +1,7 @@
> @comment $OpenBSD: PLIST,v 1.8 2021/02/19 23:13:03 sthen Exp $
> @conflict py-xdis-<3.6.11p3
> -bin/pydisasm${MODPY_BIN_SUFFIX}
> +@pkgpath devel/py-xdis
> +bin/pydisasm
> lib/python${MODPY_VERSION}/site-packages/xdis/
>
> lib/python${MODPY_VERSION}/site-packages/xdis-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
>
> lib/python${MODPY_VERSION}/site-packages/xdis-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
> blob - 3e43acd3248b85790f53c21b14293ad2ee1fe427
> file + devel/quirks/files/Quirks.pm
> --- devel/quirks/files/Quirks.pm
> +++ devel/quirks/files/Quirks.pm
> @@ -601,6 +601,12 @@ my $stem_extensions = {
> 'py-vcrpy' => 'py3-vcrpy',
> 'py-werkzeug' => 'py3-werkzeug',
> 'py-blinker' => 'py3-blinker',
> + 'py-click' => 'py3-click',
> + 'py-click-threading' => 'py3-click-threading',
> + 'py-click-plugins' => 'py3-click-plugins',
> + 'py-click-log' => 'py3-click-log',
> + 'py-spark-parser' => 'py3-spark-parser',
> + 'py-uncompyle' => 'py3-uncompyle',
> };
>
> my $obsolete_reason = {
