CVS commit: pkgsrc/databases/py-sqlalchemy-utils

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Mar  6 20:46:56 UTC 2024

Modified Files:
        pkgsrc/databases/py-sqlalchemy-utils: Makefile PLIST options.mk

Log Message:
py-sqlalchemy-utils: convert to wheel.mk

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 pkgsrc/databases/py-sqlalchemy-utils/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/databases/py-sqlalchemy-utils/PLIST \
    pkgsrc/databases/py-sqlalchemy-utils/options.mk

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

Modified files:

Index: pkgsrc/databases/py-sqlalchemy-utils/Makefile
diff -u pkgsrc/databases/py-sqlalchemy-utils/Makefile:1.34 pkgsrc/databases/py-sqlalchemy-utils/Makefile:1.35
--- pkgsrc/databases/py-sqlalchemy-utils/Makefile:1.34  Sat Jun  3 23:42:11 2023
+++ pkgsrc/databases/py-sqlalchemy-utils/Makefile       Wed Mar  6 20:46:56 2024
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.34 2023/06/03 23:42:11 markd Exp $
+# $NetBSD: Makefile,v 1.35 2024/03/06 20:46:56 wiz Exp $
 
 DISTNAME=      SQLAlchemy-Utils-0.41.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
+PKGREVISION=   1
 CATEGORIES=    databases python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=S/SQLAlchemy-Utils/}
 
@@ -10,7 +11,31 @@ HOMEPAGE=    https://github.com/kvesteri/sq
 COMMENT=       Various utility functions for SQLAlchemy
 LICENSE=       modified-bsd
 
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools>=0:../../devel/py-setuptools
+TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel>=0:../../devel/py-wheel
 DEPENDS+=      ${PYPKGPREFIX}-sqlalchemy>=1.0:../../databases/py-sqlalchemy
+TEST_DEPENDS+= ${PYPKGPREFIX}-pygments>=1.2:../../textproc/py-pygments
+TEST_DEPENDS+= ${PYPKGPREFIX}-jinja2>=2.3:../../textproc/py-jinja2
+TEST_DEPENDS+= ${PYPKGPREFIX}-docutils>=0.10:../../textproc/py-docutils
+TEST_DEPENDS+= ${PYPKGPREFIX}-flexmock>=0.9.7:../../devel/py-flexmock
+# py-psycopg
+TEST_DEPENDS+= ${PYPKGPREFIX}-psycopg2>=2.5.1:../../databases/py-psycopg2
+# py-psycopg2cffi
+# pg8000
+TEST_DEPENDS+= ${PYPKGPREFIX}-pytz>=2014.2:../../time/py-pytz
+TEST_DEPENDS+= ${PYPKGPREFIX}-dateutil-[0-9]*:../../time/py-dateutil
+TEST_DEPENDS+= ${PYPKGPREFIX}-pymysql-[0-9]*:../../databases/py-pymysql
+TEST_DEPENDS+= ${PYPKGPREFIX}-flake8>=2.4.0:../../devel/py-flake8
+TEST_DEPENDS+= ${PYPKGPREFIX}-isort>=4.2.2:../../devel/py-isort
+# pyodbc
+
+#TEST_DEPENDS+=        ${PYPKGPREFIX}-arrow>=0.3.4:../../time/py-arrow
+#TEST_DEPENDS+=        ${PYPKGPREFIX}-babel>=1.3:../../devel/py-babel
+#TEST_DEPENDS+=        ${PYPKGPREFIX}-furl>=0.3.5:../../www/py-furl
+#TEST_DEPENDS+=        ${PYPKGPREFIX}-intervals>=0.2.4:../../math/py-intervals
+#TEST_DEPENDS+=        ${PYPKGPREFIX}-anyjson>=0.3.3:../../textproc/py-anyjson
+#TEST_DEPENDS+=        ${PYPKGPREFIX}-passlib>=1.6<2.0:../../security/py-passlib
+#TEST_DEPENDS+=        ${PYPKGPREFIX}-phonenumbers>=5.9.2:../../textproc/py-phonenumbers
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
@@ -18,5 +43,5 @@ USE_LANGUAGES=        # none
 
 .include "options.mk"
 
-.include "../../lang/python/egg.mk"
+.include "../../lang/python/wheel.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/databases/py-sqlalchemy-utils/PLIST
diff -u pkgsrc/databases/py-sqlalchemy-utils/PLIST:1.9 pkgsrc/databases/py-sqlalchemy-utils/PLIST:1.10
--- pkgsrc/databases/py-sqlalchemy-utils/PLIST:1.9      Sat Jun  3 23:42:11 2023
+++ pkgsrc/databases/py-sqlalchemy-utils/PLIST  Wed Mar  6 20:46:56 2024
@@ -1,10 +1,9 @@
-@comment $NetBSD: PLIST,v 1.9 2023/06/03 23:42:11 markd Exp $
-${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
-${PYSITELIB}/${EGG_INFODIR}/requires.txt
-${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+@comment $NetBSD: PLIST,v 1.10 2024/03/06 20:46:56 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}/sqlalchemy_utils/__init__.py
 ${PYSITELIB}/sqlalchemy_utils/__init__.pyc
 ${PYSITELIB}/sqlalchemy_utils/__init__.pyo
Index: pkgsrc/databases/py-sqlalchemy-utils/options.mk
diff -u pkgsrc/databases/py-sqlalchemy-utils/options.mk:1.9 pkgsrc/databases/py-sqlalchemy-utils/options.mk:1.10
--- pkgsrc/databases/py-sqlalchemy-utils/options.mk:1.9 Mon Jul  3 21:19:05 2023
+++ pkgsrc/databases/py-sqlalchemy-utils/options.mk     Wed Mar  6 20:46:56 2024
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.9 2023/07/03 21:19:05 wiz Exp $
+# $NetBSD: options.mk,v 1.10 2024/03/06 20:46:56 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.py-sqlalchemy-utils
 PKG_SUPPORTED_OPTIONS= arrow babel furl intervals ipaddress json password
-PKG_SUPPORTED_OPTIONS+=        phone tests timezone
+PKG_SUPPORTED_OPTIONS+=        phone timezone
 PKG_SUGGESTED_OPTIONS+=        # blank
 
 .include "../../mk/bsd.options.mk"
@@ -39,26 +39,6 @@ DEPENDS+=    ${PYPKGPREFIX}-passlib>=1.6<2.
 DEPENDS+=      ${PYPKGPREFIX}-phonenumbers>=5.9.2:../../textproc/py-phonenumbers
 .endif
 
-.if !empty(PKG_OPTIONS:Mtests)
-DEPENDS+=      ${PYPKGPREFIX}-jinja2>=2.3:../../textproc/py-jinja2
-DEPENDS+=      ${PYPKGPREFIX}-docutils>=0.10:../../textproc/py-docutils
-DEPENDS+=      ${PYPKGPREFIX}-flexmock>=0.9.7:../../devel/py-flexmock
-DEPENDS+=      ${PYPKGPREFIX}-psycopg2>=2.5.1:../../databases/py-psycopg2
-DEPENDS+=      ${PYPKGPREFIX}-pytz>=2014.2:../../time/py-pytz
-DEPENDS+=      ${PYPKGPREFIX}-pymysql-[0-9]*:../../databases/py-pymysql
-DEPENDS+=      ${PYPKGPREFIX}-arrow>=0.3.4:../../time/py-arrow
-DEPENDS+=      ${PYPKGPREFIX}-babel>=1.3:../../devel/py-babel
-DEPENDS+=      ${PYPKGPREFIX}-furl>=0.3.5:../../www/py-furl
-DEPENDS+=      ${PYPKGPREFIX}-intervals>=0.2.4:../../math/py-intervals
-DEPENDS+=      ${PYPKGPREFIX}-ipaddr-[0-9]*:../../devel/py-ipaddr
-DEPENDS+=      ${PYPKGPREFIX}-anyjson>=0.3.3:../../textproc/py-anyjson
-DEPENDS+=      ${PYPKGPREFIX}-passlib>=1.6<2.0:../../security/py-passlib
-DEPENDS+=      ${PYPKGPREFIX}-phonenumbers>=5.9.2:../../textproc/py-phonenumbers
-DEPENDS+=      ${PYPKGPREFIX}-dateutil-[0-9]*:../../time/py-dateutil
-DEPENDS+=      ${PYPKGPREFIX}-pygments-[0-9]*:../../textproc/py-pygments
-DEPENDS+=      ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
-.endif
-
 .if !empty(PKG_OPTIONS:Mtimezone)
 DEPENDS+=      ${PYPKGPREFIX}-dateutil-[0-9]*:../../time/py-dateutil
 .endif