py-google-maps-services-python: renamed to py-googlemaps

6 files changed, 21 insertions, 17 deletions

diff --git a/geography/Makefile b/geography/Makefile
index 69a39dc6ade..9f30473b1fe 100644
--- a/geography/Makefile
+++ b/geography/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.78 2020/03/11 10:55:28 wiz Exp $
+# $NetBSD: Makefile,v 1.79 2020/03/21 18:59:56 adam Exp $
 #
 
 COMMENT=	Software for geographical-related uses
@@ -54,7 +54,7 @@ SUBDIR+=	proj-doc
 SUBDIR+=	py-country
 SUBDIR+=	py-gdal
 SUBDIR+=	py-geojson
-SUBDIR+=	py-google-maps-services-python
+SUBDIR+=	py-googlemaps
 SUBDIR+=	py-obspy
 SUBDIR+=	py-proj
 SUBDIR+=	py-trytond-country
diff --git a/geography/py-google-maps-services-python/distinfo b/geography/py-google-maps-services-python/distinfo
deleted file mode 100644
index 1acf269edf2..00000000000
--- a/geography/py-google-maps-services-python/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.8 2020/03/20 01:37:23 ryoon Exp $
-
-SHA1 (google-maps-services-python-4.2.0.tar.gz) = 9f0eb9fa985da827622d07606709fe7115345ab3
-RMD160 (google-maps-services-python-4.2.0.tar.gz) = 3444686b521fdbb5408e929b4d309c67ab206d49
-SHA512 (google-maps-services-python-4.2.0.tar.gz) = 1fab45bc0beecc21e99d7881f195f9be3fd6ad53c74f6bd238fb7a01738d456d38cc8975ebb6dbe1f3abde967db78d000161dac60fa675b74166cf5bf7bc72f2
-Size (google-maps-services-python-4.2.0.tar.gz) = 46098 bytes
diff --git a/geography/py-google-maps-services-python/DESCR b/geography/py-googlemaps/DESCR
index a9944725dbe..a9944725dbe 100644
--- a/geography/py-google-maps-services-python/DESCR
+++ b/geography/py-googlemaps/DESCR
diff --git a/geography/py-google-maps-services-python/Makefile b/geography/py-googlemaps/Makefile
index d613f242dbd..8540189aa2c 100644
--- a/geography/py-google-maps-services-python/Makefile
+++ b/geography/py-googlemaps/Makefile
@@ -1,23 +1,27 @@
-# $NetBSD: Makefile,v 1.11 2020/03/20 07:28:14 wiz Exp $
+# $NetBSD: Makefile,v 1.1 2020/03/21 18:59:57 adam Exp $
 
-DISTNAME=	google-maps-services-python-4.2.0
+DISTNAME=	googlemaps-4.2.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	geography python
-MASTER_SITES=	-https://github.com/googlemaps/google-maps-services-python/archive/${PKGVERSION_NOREV}${EXTRACT_SUFX}
+MASTER_SITES=	${MASTER_SITE_PYPI:=g/googlemaps/}
 
 MAINTAINER=	kleink@NetBSD.org
-HOMEPAGE=	https://github.com/googlemaps/google-maps-services-python/
-COMMENT=	Python client library for Google Maps API Web Services
+HOMEPAGE=	https://github.com/googlemaps/google-maps-services-python
+COMMENT=	Python client library for Google Maps Platform
 LICENSE=	apache-2.0
 
-DEPENDS+=	${PYPKGPREFIX}-requests>=2.20.0<3.0:../../devel/py-requests
+DEPENDS+=	${PYPKGPREFIX}-requests>=2.20.0:../../devel/py-requests
 TEST_DEPENDS+=	${PYPKGPREFIX}-responses-[0-9]*:../../net/py-responses
 TEST_DEPENDS+=	${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
 TEST_DEPENDS+=	${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+TEST_DEPENDS+=	${PYPKGPREFIX}-test-cov-[0-9]*:../../devel/py-test-cov
+TEST_DEPENDS+=	${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27
+USE_LANGUAGES=	# none
+
+PYSETUPTESTTARGET=	pytest
 
-EGG_NAME=	googlemaps-${PKGVERSION_NOREV}
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/geography/py-google-maps-services-python/PLIST b/geography/py-googlemaps/PLIST
index cee9b48870a..b16be795fea 100644
--- a/geography/py-google-maps-services-python/PLIST
+++ b/geography/py-googlemaps/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2020/03/20 07:28:14 wiz Exp $
+@comment $NetBSD: PLIST,v 1.1 2020/03/21 18:59:57 adam Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
diff --git a/geography/py-googlemaps/distinfo b/geography/py-googlemaps/distinfo
new file mode 100644
index 00000000000..f74e5db224d
--- /dev/null
+++ b/geography/py-googlemaps/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2020/03/21 18:59:57 adam Exp $
+
+SHA1 (googlemaps-4.2.0.tar.gz) = 6feb0107169eac62073803df39920e158f7a115f
+RMD160 (googlemaps-4.2.0.tar.gz) = f9b8e7aab9bbf7aa0e030ddde81bf512ffba9c50
+SHA512 (googlemaps-4.2.0.tar.gz) = 2cf36fc9952566b4dbb0404bbb8984f1aeb20ebc6fd34ab6996cc818a487839fa14360eefd9f408eb3caabe36e3196d1665c83e047ec8c3c363c00ddf3d7779d
+Size (googlemaps-4.2.0.tar.gz) = 40229 bytes