Index | Thread | Search

From:
Stuart Henderson <stu@spacehopper.org>
Subject:
Re: make setuptools_git python3-only
To:
Daniel Dickman <didickman@gmail.com>
Cc:
ports@openbsd.org
Date:
Sun, 18 Feb 2024 09:32:04 +0000

Download raw body.

Thread
On 2024/02/17 11:40, Daniel Dickman wrote:
> Looks like this port has no more python2 consumers anymore.
> 
> ok to make it python3-only?

ok - needs a quirks addition too.

> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/py-setuptools_git/Makefile,v
> diff -u -p -u -r1.12 Makefile
> --- Makefile	28 Nov 2022 13:37:48 -0000	1.12
> +++ Makefile	17 Feb 2024 16:37:31 -0000
> @@ -3,7 +3,7 @@ COMMENT=		setuptools revision control sy
>  MODPY_EGG_VERSION=	1.2
>  DISTNAME=		setuptools-git-${MODPY_EGG_VERSION}
>  PKGNAME=		py-${DISTNAME}
> -REVISION=		6
> +REVISION=		7
>  
>  CATEGORIES=		devel
>  
> @@ -13,11 +13,11 @@ PERMIT_PACKAGE=	Yes
>  MODULES=		lang/python
>  
>  MODPY_PI=		Yes
> -MODPY_SETUPTOOLS=	Yes
> +MODPY_PYBUILD=		setuptools
>  
>  RUN_DEPENDS=		devel/py-setuptools${MODPY_FLAVOR}
>  
>  FLAVORS=		python3
> -FLAVOR?=
> +FLAVOR=			python3
>  
>  .include <bsd.port.mk>
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/devel/py-setuptools_git/pkg/PLIST,v
> diff -u -p -u -r1.2 PLIST
> --- pkg/PLIST	11 Mar 2022 18:52:56 -0000	1.2
> +++ pkg/PLIST	17 Feb 2024 16:37:31 -0000
> @@ -1,15 +1,22 @@
> +@conflict py-setuptools_git-*
> +@pkgpath devel/py-setuptools_git
>  lib/python${MODPY_VERSION}/site-packages/setuptools_git/
> -lib/python${MODPY_VERSION}/site-packages/setuptools_git-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
> -lib/python${MODPY_VERSION}/site-packages/setuptools_git-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
> -lib/python${MODPY_VERSION}/site-packages/setuptools_git-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
> -lib/python${MODPY_VERSION}/site-packages/setuptools_git-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
> -lib/python${MODPY_VERSION}/site-packages/setuptools_git-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
> -lib/python${MODPY_VERSION}/site-packages/setuptools_git-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
> -lib/python${MODPY_VERSION}/site-packages/setuptools_git-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/zip-safe
> +lib/python${MODPY_VERSION}/site-packages/setuptools_git-${MODPY_EGG_VERSION}.dist-info/
> +lib/python${MODPY_VERSION}/site-packages/setuptools_git-${MODPY_EGG_VERSION}.dist-info/AUTHORS.txt
> +lib/python${MODPY_VERSION}/site-packages/setuptools_git-${MODPY_EGG_VERSION}.dist-info/LICENSE.txt
> +lib/python${MODPY_VERSION}/site-packages/setuptools_git-${MODPY_EGG_VERSION}.dist-info/METADATA
> +lib/python${MODPY_VERSION}/site-packages/setuptools_git-${MODPY_EGG_VERSION}.dist-info/RECORD
> +lib/python${MODPY_VERSION}/site-packages/setuptools_git-${MODPY_EGG_VERSION}.dist-info/WHEEL
> +lib/python${MODPY_VERSION}/site-packages/setuptools_git-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
> +lib/python${MODPY_VERSION}/site-packages/setuptools_git-${MODPY_EGG_VERSION}.dist-info/top_level.txt
> +lib/python${MODPY_VERSION}/site-packages/setuptools_git-${MODPY_EGG_VERSION}.dist-info/zip-safe
>  lib/python${MODPY_VERSION}/site-packages/setuptools_git/__init__.py
>  ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/setuptools_git/${MODPY_PYCACHE}/
> +lib/python${MODPY_VERSION}/site-packages/setuptools_git/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
>  lib/python${MODPY_VERSION}/site-packages/setuptools_git/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/setuptools_git/${MODPY_PYCACHE}tests.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
>  lib/python${MODPY_VERSION}/site-packages/setuptools_git/${MODPY_PYCACHE}tests.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/setuptools_git/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
>  lib/python${MODPY_VERSION}/site-packages/setuptools_git/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
>  lib/python${MODPY_VERSION}/site-packages/setuptools_git/tests.py
>  lib/python${MODPY_VERSION}/site-packages/setuptools_git/utils.py
>