Re: [update] geo/py-xyzservices to 2023.5.0

diff refs/heads/master refs/heads/xyz
commit - 1a63eb3431af3c6e15e2135cc90cf4b3f52372ea
commit + 40b8549b147e0f447dce8cb3c22591e53340c6b7
blob - 462ed3e0184fd5f1f3aa8ee4a6be7677b280f113
blob + 647a50145a23d55353304b05e9295656dc52c4b0
--- geo/py-xyzservices/Makefile
+++ geo/py-xyzservices/Makefile
@@ -1,6 +1,6 @@
COMMENT = source of XYZ tiles providers

-MODPY_EGG_VERSION = 2023.2.0
+MODPY_EGG_VERSION = 2023.5.0

DISTNAME = xyzservices-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
@@ -18,7 +18,8 @@ MODPY_PYBUILD = setuptools
FLAVOR = python3
FLAVORS = python3

-MODPY_PYBUILD = setuptools
+MODPY_PYBUILD = setuptools_scm
+MAKE_ENV = SETUPTOOLS_SCM_PRETEND_VERSION=${MODPY_EGG_VERSION}

# Many tests want to get online, but there are passing tests
TEST_DEPENDS = geo/py-mercantile${MODPY_FLAVOR} \
blob - ee66bea0c4c1558fc7e4aa6f5bf18054f3cba44f
blob + 813548e8f9d4e3365355c86be0b0a8948f1e0415
--- geo/py-xyzservices/distinfo
+++ geo/py-xyzservices/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xyzservices-2023.2.0.tar.gz) = uMFDIovRSZdKZy90sRMsPTYTfj/IxIl7ywN2C7Az97M=
-SIZE (xyzservices-2023.2.0.tar.gz) = 1133277
+SHA256 (xyzservices-2023.5.0.tar.gz) = bACtQi47yNG9SG55icpCajB53j0B/rpOQbFWhUNT9SU=
+SIZE (xyzservices-2023.5.0.tar.gz) = 1112929
blob - 66d4af3086647cd47dc4230449bc11e8431cc276
blob + 28dfe53b2f0711e7bf295253fe13ea34e696f086
--- geo/py-xyzservices/pkg/PLIST
+++ geo/py-xyzservices/pkg/PLIST
@@ -9,13 +9,10 @@ lib/python${MODPY_VERSION}/site-packages/xyzservices/$
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/xyzservices/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/xyzservices/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/xyzservices/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/xyzservices/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/xyzservices/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/xyzservices/${MODPY_PYCACHE}lib.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/xyzservices/${MODPY_PYCACHE}lib.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/xyzservices/${MODPY_PYCACHE}providers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/xyzservices/${MODPY_PYCACHE}providers.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/xyzservices/_version.py
lib/python${MODPY_VERSION}/site-packages/xyzservices/data/
lib/python${MODPY_VERSION}/site-packages/xyzservices/data/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/xyzservices/data/${MODPY_PYCACHE}/
On Sat, Jun 24, 2023 at 05:43:54PM +0000, Lucas Raab wrote:
> Hello,
>
> Notable change is the addition of a Ordinance Survey provider and partial move
> to pyproject.toml. setuptools is still required for now though. Tests pass
> fine outside of the ones which want to go online. The new patch dances around
> needing setuptools_scm which will fail as we don't have a git checkout to
> determine a version. Comments there?
>
> Thanks,
> Lucas

updated diff with workaround instead of patching courtesy of sthen@. thanks!