CVS commit: pkgsrc/chat/py-mastodon

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

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

Modified Files:
        pkgsrc/chat/py-mastodon: Makefile PLIST distinfo
Added Files:
        pkgsrc/chat/py-mastodon/patches: patch-setup.py

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

Add missing test dependencies.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/chat/py-mastodon/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/chat/py-mastodon/PLIST
cvs rdiff -u -r1.9 -r1.10 pkgsrc/chat/py-mastodon/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/chat/py-mastodon/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/chat/py-mastodon/Makefile
diff -u pkgsrc/chat/py-mastodon/Makefile:1.14 pkgsrc/chat/py-mastodon/Makefile:1.15
--- pkgsrc/chat/py-mastodon/Makefile:1.14       Tue Aug  1 23:20:38 2023
+++ pkgsrc/chat/py-mastodon/Makefile    Sat Aug 10 14:37:30 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2023/08/01 23:20:38 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2024/08/10 14:37:30 wiz Exp $
 
 PKGNAME=       ${PYPKGPREFIX}-mastodon-1.5.0
-PKGREVISION=   1
+PKGREVISION=   2
 DISTNAME=      Mastodon.py-${PKGVERSION_NOREV}
 CATEGORIES=    chat www python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=M/Mastodon.py/}
@@ -11,8 +11,8 @@ HOMEPAGE=     https://github.com/halcy/Masto
 COMMENT=       Python wrapper for the Mastodon API
 LICENSE=       mit
 
-EXTRACT_USING= bsdtar
-USE_LANGUAGES= # none
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
+TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
 
 DEPENDS+=      ${PYPKGPREFIX}-blurhash>=1.1.4:../../graphics/py-blurhash
 DEPENDS+=      ${PYPKGPREFIX}-dateutil-[0-9]*:../../time/py-dateutil
@@ -23,15 +23,20 @@ DEPENDS+=   ${PYPKGPREFIX}-pytz-[0-9]*:../
 DEPENDS+=      ${PYPKGPREFIX}-requests>=2.4.2:../../devel/py-requests
 DEPENDS+=      ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 
-TOOL_DEPENDS+= ${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
-
-TEST_DEPENDS+= ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
 TEST_DEPENDS+= ${PYPKGPREFIX}-contextlib2-[0-9]*:../../devel/py-contextlib2
-TEST_DEPENDS+= ${PYPKGPREFIX}-wrapt-[0-9]*:../../devel/py-wrapt
+TEST_DEPENDS+= ${PYPKGPREFIX}-requests-mock-[0-9]*:../../devel/py-requests-mock
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-cov-[0-9]*:../../devel/py-test-cov
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-mock-[0-9]*:../../devel/py-test-mock
+TEST_DEPENDS+= ${PYPKGPREFIX}-vcrpy-[0-9]*:../../www/py-vcrpy
+TEST_DEPENDS+= ${PYPKGPREFIX}-wrapt-[0-9]*:../../devel/py-wrapt
+TEST_DEPENDS+= ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27 38
 
-.include "../../lang/python/egg.mk"
+USE_LANGUAGES= # none
+
+# as of 1.5.0
+# 81 failed, 156 passed, 3 skipped, 3 xfailed, 104 warnings, 31 errors
+
+.include "../../lang/python/wheel.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/chat/py-mastodon/PLIST
diff -u pkgsrc/chat/py-mastodon/PLIST:1.1 pkgsrc/chat/py-mastodon/PLIST:1.2
--- pkgsrc/chat/py-mastodon/PLIST:1.1   Wed Jul 25 17:00:57 2018
+++ pkgsrc/chat/py-mastodon/PLIST       Sat Aug 10 14:37:30 2024
@@ -1,15 +1,15 @@
-@comment $NetBSD: PLIST,v 1.1 2018/07/25 17:00:57 nia Exp $
-${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/requires.txt
-${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+@comment $NetBSD: PLIST,v 1.2 2024/08/10 14:37:30 wiz Exp $
+${PYSITELIB}/${WHEEL_INFODIR}/LICENSE
+${PYSITELIB}/${WHEEL_INFODIR}/METADATA
+${PYSITELIB}/${WHEEL_INFODIR}/RECORD
+${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
+${PYSITELIB}/${WHEEL_INFODIR}/top_level.txt
 ${PYSITELIB}/mastodon/Mastodon.py
-${PYSITELIB}/mastodon/Mastodon.pyo
 ${PYSITELIB}/mastodon/Mastodon.pyc
+${PYSITELIB}/mastodon/Mastodon.pyo
 ${PYSITELIB}/mastodon/__init__.py
-${PYSITELIB}/mastodon/__init__.pyo
 ${PYSITELIB}/mastodon/__init__.pyc
-${PYSITELIB}/mastodon/streaming.pyo
-${PYSITELIB}/mastodon/streaming.pyc
+${PYSITELIB}/mastodon/__init__.pyo
 ${PYSITELIB}/mastodon/streaming.py
+${PYSITELIB}/mastodon/streaming.pyc
+${PYSITELIB}/mastodon/streaming.pyo

Index: pkgsrc/chat/py-mastodon/distinfo
diff -u pkgsrc/chat/py-mastodon/distinfo:1.9 pkgsrc/chat/py-mastodon/distinfo:1.10
--- pkgsrc/chat/py-mastodon/distinfo:1.9        Tue Oct 26 10:05:23 2021
+++ pkgsrc/chat/py-mastodon/distinfo    Sat Aug 10 14:37:30 2024
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.9 2021/10/26 10:05:23 nia Exp $
+$NetBSD: distinfo,v 1.10 2024/08/10 14:37:30 wiz Exp $
 
 BLAKE2s (Mastodon.py-1.5.0.tar.gz) = e37aeab3271ed1f37c74bcd5f66cf49af33d2695a0d086600eb894b26b386f7c
 SHA512 (Mastodon.py-1.5.0.tar.gz) = 5c22adc68eb5b122f6b6a43525daadfac19de6c26d0db67135a932f0422c9b9d3700b45070a23b683f92aa41237cdbde5a837c17ce9a7dd0afec3c5ae65eab1b
 Size (Mastodon.py-1.5.0.tar.gz) = 706918 bytes
+SHA1 (patch-setup.py) = 2d826a9896ff8876841c606038259bce55374e47

Added files:

Index: pkgsrc/chat/py-mastodon/patches/patch-setup.py
diff -u /dev/null pkgsrc/chat/py-mastodon/patches/patch-setup.py:1.1
--- /dev/null   Sat Aug 10 14:37:30 2024
+++ pkgsrc/chat/py-mastodon/patches/patch-setup.py      Sat Aug 10 14:37:30 2024
@@ -0,0 +1,14 @@
+$NetBSD: patch-setup.py,v 1.1 2024/08/10 14:37:30 wiz Exp $
+
+https://github.com/halcy/Mastodon.py/issues/378
+
+--- setup.py.orig      2024-08-10 12:02:10.316469270 +0000
++++ setup.py
+@@ -2,7 +2,6 @@ from setuptools import setup
+ 
+ test_deps = [
+     'pytest', 
+-    'pytest-runner', 
+     'pytest-cov', 
+     'vcrpy', 
+     'pytest-vcr',