CVS commit: pkgsrc/devel/py-setuptools_trial

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Aug 10 15:14:37 UTC 2024

Modified Files:
        pkgsrc/devel/py-setuptools_trial: Makefile PLIST distinfo
        pkgsrc/devel/py-setuptools_trial/patches: patch-setup.py

Log Message:
py-setuptools_trial: convert to wheel.mk.

Remove unused test dependency.
Document test status.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/devel/py-setuptools_trial/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/py-setuptools_trial/PLIST
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/py-setuptools_trial/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/devel/py-setuptools_trial/patches/patch-setup.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/py-setuptools_trial/Makefile
diff -u pkgsrc/devel/py-setuptools_trial/Makefile:1.20 pkgsrc/devel/py-setuptools_trial/Makefile:1.21
--- pkgsrc/devel/py-setuptools_trial/Makefile:1.20      Fri Apr 29 23:22:31 2022
+++ pkgsrc/devel/py-setuptools_trial/Makefile   Sat Aug 10 15:14:37 2024
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2022/04/29 23:22:31 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2024/08/10 15:14:37 wiz Exp $
 
 DISTNAME=      setuptools_trial-0.6.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=s/setuptools_trial/}
 
@@ -11,14 +11,21 @@ HOMEPAGE=   https://github.com/rutsky/setu
 COMMENT=       Setuptools plugin for Twisted-based unit tests
 LICENSE=       modified-bsd
 
-DEPENDS+=      ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
+TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
+DEPENDS+=      ${PYPKGPREFIX}-twisted>=2.4.0:../../net/py-twisted
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-virtualenv-[0-9]*:../../devel/py-test-virtualenv
 TEST_DEPENDS+= ${PYPKGPREFIX}-virtualenv-[0-9]*:../../devel/py-virtualenv
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+# test status as of 0.6.0
+# with Python 3.11:
+# 2 failed
+# with Python 3.12:
+# uses deprecated 'imp' module which was removed in Python 3.12
+
 USE_LANGUAGES= # none
 
-.include "../../lang/python/egg.mk"
+.include "../../lang/python/wheel.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-setuptools_trial/PLIST
diff -u pkgsrc/devel/py-setuptools_trial/PLIST:1.4 pkgsrc/devel/py-setuptools_trial/PLIST:1.5
--- pkgsrc/devel/py-setuptools_trial/PLIST:1.4  Tue Apr  3 20:19:47 2018
+++ pkgsrc/devel/py-setuptools_trial/PLIST      Sat Aug 10 15:14:37 2024
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.4 2018/04/03 20:19:47 adam Exp $
-${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
-${PYSITELIB}/${EGG_INFODIR}/requires.txt
-${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+@comment $NetBSD: PLIST,v 1.5 2024/08/10 15:14:37 wiz Exp $
+${PYSITELIB}/${WHEEL_INFODIR}/COPYING.SPL.txt
+${PYSITELIB}/${WHEEL_INFODIR}/METADATA
+${PYSITELIB}/${WHEEL_INFODIR}/RECORD
+${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
+${PYSITELIB}/${WHEEL_INFODIR}/entry_points.txt
+${PYSITELIB}/${WHEEL_INFODIR}/top_level.txt
 ${PYSITELIB}/setuptools_trial/__init__.py
 ${PYSITELIB}/setuptools_trial/__init__.pyc
 ${PYSITELIB}/setuptools_trial/__init__.pyo

Index: pkgsrc/devel/py-setuptools_trial/distinfo
diff -u pkgsrc/devel/py-setuptools_trial/distinfo:1.8 pkgsrc/devel/py-setuptools_trial/distinfo:1.9
--- pkgsrc/devel/py-setuptools_trial/distinfo:1.8       Tue Oct 26 10:19:05 2021
+++ pkgsrc/devel/py-setuptools_trial/distinfo   Sat Aug 10 15:14:37 2024
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2021/10/26 10:19:05 nia Exp $
+$NetBSD: distinfo,v 1.9 2024/08/10 15:14:37 wiz Exp $
 
 BLAKE2s (setuptools_trial-0.6.0.tar.gz) = c8e97e5c70af28e07ce62dbd036f94cec0848baf72acb948a8780c07905a03df
 SHA512 (setuptools_trial-0.6.0.tar.gz) = 9104b98627f57ed53c90d22042346875c5324d7b30e1ec9ba1718b5c59a786915a8fe0a53789a5dbd9318a12b27122661234f5be403365261db6a8728ce39827
 Size (setuptools_trial-0.6.0.tar.gz) = 6227 bytes
-SHA1 (patch-setup.py) = 5bb008afe4aad6949799ca9d79da775ef47cdd5d
+SHA1 (patch-setup.py) = 59b1208e12fd2dda1a9f550c9a6a6a03b6741cdc

Index: pkgsrc/devel/py-setuptools_trial/patches/patch-setup.py
diff -u pkgsrc/devel/py-setuptools_trial/patches/patch-setup.py:1.1 pkgsrc/devel/py-setuptools_trial/patches/patch-setup.py:1.2
--- pkgsrc/devel/py-setuptools_trial/patches/patch-setup.py:1.1 Tue Apr  3 20:19:47 2018
+++ pkgsrc/devel/py-setuptools_trial/patches/patch-setup.py     Sat Aug 10 15:14:37 2024
@@ -1,10 +1,23 @@
-$NetBSD: patch-setup.py,v 1.1 2018/04/03 20:19:47 adam Exp $
+$NetBSD: patch-setup.py,v 1.2 2024/08/10 15:14:37 wiz Exp $
+
+Test-runner is not really used.
+https://github.com/rutsky/setuptools-trial/issues/272
 
 Do not install docs and avoid conflict between Python versions.
 
---- setup.py.orig      2018-04-03 20:08:51.000000000 +0000
+--- setup.py.orig      2016-03-21 03:17:06.000000000 +0000
 +++ setup.py
-@@ -86,7 +86,6 @@ setup(
+@@ -54,9 +54,6 @@ PKG = 'setuptools_trial'
+ doc_loc = "share/doc/python-" + PKG
+ data_files = [(doc_loc, data_fnames)]
+ 
+-if {'pytest', 'test'}.intersection(sys.argv):
+-    setup_requires.append('pytest_runner')
+-
+ setup(
+     name=PKG,
+     version=verstr,
+@@ -86,7 +83,6 @@ setup(
      license="BSD",
      packages=find_packages(exclude=("tests",)),
      include_package_data=True,