Saturday, June 24, 2023

[update] geo/py-xyzservices to 2023.5.0

diff /usr/ports
commit - 4cd143086b648296ded1cb2eb6315a7b10e672d1
path + /usr/ports
blob - 462ed3e0184fd5f1f3aa8ee4a6be7677b280f113
file + geo/py-xyzservices/Makefile
--- 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}
@@ -24,4 +24,7 @@ TEST_DEPENDS = geo/py-mercantile${MODPY_FLAVOR} \
TEST_DEPENDS = geo/py-mercantile${MODPY_FLAVOR} \
www/py-requests${MODPY_FLAVOR}

+pre-build:
+ ${SUBST_CMD} ${WRKDIST}/setup.py
+
.include <bsd.port.mk>
blob - ee66bea0c4c1558fc7e4aa6f5bf18054f3cba44f
file + geo/py-xyzservices/distinfo
--- 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 - /dev/null
file + geo/py-xyzservices/patches/patch-setup_py (mode 644)
--- /dev/null
+++ geo/py-xyzservices/patches/patch-setup_py
@@ -0,0 +1,12 @@
+Index: setup.py
+--- setup.py.orig
++++ setup.py
+@@ -24,7 +24,6 @@ setuptools.setup(
+ "Programming Language :: Python :: 3.8",
+ "Programming Language :: Python :: 3 :: Only",
+ ],
+- use_scm_version=True,
+- setup_requires=["setuptools_scm"],
++ version="${MODPY_EGG_VERSION}",
+ data_files=[("share/xyzservices", ["xyzservices/data/providers.json"])],
+ )
blob - 66d4af3086647cd47dc4230449bc11e8431cc276
file + geo/py-xyzservices/pkg/PLIST
--- 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}/
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

No comments:

Post a Comment