CVS commit: pkgsrc/www/py-google-api-python-client

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Jan 27 11:57:26 UTC 2022

Modified Files:
        pkgsrc/www/py-google-api-python-client: Makefile distinfo
Added Files:
        pkgsrc/www/py-google-api-python-client/patches: patch-setup.py

Log Message:
py-google-api-python-client: bump PKGREVISION

relax restrictions on uritemplate and remove
test dependency on py-unittest2


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 pkgsrc/www/py-google-api-python-client/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/www/py-google-api-python-client/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/py-google-api-python-client/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/www/py-google-api-python-client/Makefile
diff -u pkgsrc/www/py-google-api-python-client/Makefile:1.45 pkgsrc/www/py-google-api-python-client/Makefile:1.46
--- pkgsrc/www/py-google-api-python-client/Makefile:1.45        Tue Jan  4 20:55:29 2022
+++ pkgsrc/www/py-google-api-python-client/Makefile     Thu Jan 27 11:57:26 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.45 2022/01/04 20:55:29 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2022/01/27 11:57:26 wiz Exp $
 
 DISTNAME=      google-api-python-client-2.15.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    www python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=g/google-api-python-client/}
 
@@ -20,11 +20,18 @@ DEPENDS+=   ${PYPKGPREFIX}-uritemplate>=3.
 TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
 TEST_DEPENDS+= ${PYPKGPREFIX}-oauth2client-[0-9]*:../../security/py-oauth2client
 TEST_DEPENDS+= ${PYPKGPREFIX}-parameterized-[0-9]*:../../devel/py-parameterized
-TEST_DEPENDS+= ${PYPKGPREFIX}-unittest2-[0-9]*:../../devel/py-unittest2
 
 USE_LANGUAGES= # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+# unittest2 is a replacement for python 2.x for unittest; this package
+# is limited to python 3.x anyway, so use unittest directly
+SUBST_CLASSES+=                unittest
+SUBST_STAGE.unittest=  pre-build
+SUBST_MESSAGE.unittest=        Removing unittest2 dependency
+SUBST_SED.unittest+=   -e 's/import unittest2 as unittest/import unittest/'
+SUBST_FILES.unittest+= tests/test*.py
+
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/py-google-api-python-client/distinfo
diff -u pkgsrc/www/py-google-api-python-client/distinfo:1.39 pkgsrc/www/py-google-api-python-client/distinfo:1.40
--- pkgsrc/www/py-google-api-python-client/distinfo:1.39        Tue Oct 26 11:30:40 2021
+++ pkgsrc/www/py-google-api-python-client/distinfo     Thu Jan 27 11:57:26 2022
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.39 2021/10/26 11:30:40 nia Exp $
+$NetBSD: distinfo,v 1.40 2022/01/27 11:57:26 wiz Exp $
 
 BLAKE2s (google-api-python-client-2.15.0.tar.gz) = 6b37f5dac5d662b4d52cdc827c4aa8daedce06b197eeb437d53bf4edb984fa12
 SHA512 (google-api-python-client-2.15.0.tar.gz) = aa69866b5c67fe1b1af2e2dc6b2117a861c5cc000a17d24283bd57aa55e6a98bf9ffc9002d410ffdf0c4984d0fd9c46a112a73adc968495500b848f02853af6a
 Size (google-api-python-client-2.15.0.tar.gz) = 6832207 bytes
+SHA1 (patch-setup.py) = 27e3575c1976047ad3feb08e1e9b34e69955fd2c

Added files:

Index: pkgsrc/www/py-google-api-python-client/patches/patch-setup.py
diff -u /dev/null pkgsrc/www/py-google-api-python-client/patches/patch-setup.py:1.1
--- /dev/null   Thu Jan 27 11:57:26 2022
+++ pkgsrc/www/py-google-api-python-client/patches/patch-setup.py       Thu Jan 27 11:57:26 2022
@@ -0,0 +1,15 @@
+$NetBSD: patch-setup.py,v 1.1 2022/01/27 11:57:26 wiz Exp $
+
+Relax restrictions.
+
+--- setup.py.orig      2021-07-27 10:49:04.000000000 +0000
++++ setup.py
+@@ -42,7 +42,7 @@ install_requires = [
+     # Until this issue is closed
+     # https://github.com/googleapis/google-cloud-python/issues/10566
+     "google-api-core>=1.21.0,<3.0.0dev",
+-    "uritemplate>=3.0.0,<4dev",
++    "uritemplate>=3.0.0",
+ ]
+ 
+ package_root = os.path.abspath(os.path.dirname(__file__))