On Tue, 31 Mar 2020, Bjorn Ketelaars wrote:
> On Tue 31/03/2020 18:47, Paco Esteban wrote:
> > Hi ports@,
> >
> > This is an update for devel/py-arrow to its latest version 0.15.5.
> > You can see the changelog here:
> >
> > https://github.com/crsmithdev/arrow/blob/master/CHANGELOG.rst
> >
> > While there, I've enabled pytest and dropped py2 support.
> >
> > All tests pass for me on amd64. This port has no consumers as far as
> > I can see.
> >
> > comments ? ok ?
>
> I think you forgot the @conflict- and @pkgpath-marker in PLIST
And you're right, of course.
Here's the corrected diff. Thanks Bjorn.
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/devel/py-arrow/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile 9 Sep 2019 19:23:48 -0000 1.7
+++ Makefile 31 Mar 2020 16:23:51 -0000
@@ -2,7 +2,7 @@
COMMENT = better dates and times for Python
-MODPY_EGG_VERSION = 0.14.7
+MODPY_EGG_VERSION = 0.15.5
DISTNAME = arrow-${MODPY_EGG_VERSION}
PKGNAME = py-arrow-${MODPY_EGG_VERSION}
@@ -16,17 +16,20 @@ PERMIT_PACKAGE = Yes
MODULES = lang/python
MODPY_SETUPTOOLS = Yes
MODPY_PI = Yes
+MODPY_PYTEST = Yes
+MODPY_PYTEST_ARGS = tests/*
RUN_DEPENDS = devel/py-dateutil${MODPY_FLAVOR}
TEST_DEPENDS = devel/py-chai${MODPY_FLAVOR} \
+ devel/py-dateparser${MODPY_FLAVOR} \
+ devel/py-mock${MODPY_FLAVOR} \
devel/py-simplejson${MODPY_FLAVOR} \
- devel/py-tz${MODPY_FLAVOR}
+ devel/py-test-cov${MODPY_FLAVOR} \
+ devel/py-test-mock${MODPY_FLAVOR} \
+ devel/py-tz${MODPY_FLAVOR} \
+ textproc/py-sphinx${MODPY_FLAVOR}
FLAVORS += python3
-FLAVOR ?=
-
-.if !${FLAVOR:Mpython3}
-TEST_DEPENDS += devel/py-backports-functools-lru-cache
-.endif
+FLAVOR = python3
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/devel/py-arrow/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 9 Sep 2019 19:23:48 -0000 1.5
+++ distinfo 14 Feb 2020 10:36:59 -0000
@@ -1,2 +1,2 @@
-SHA256 (arrow-0.14.7.tar.gz) = Z/i+fAz0IEJLxi2NfcQLROS7L3tRX5zClU+zbjV5dlY=
-SIZE (arrow-0.14.7.tar.gz) = 67657
+SHA256 (arrow-0.15.5.tar.gz) = U5DkZOLF92lxtg/6fuKcWYx1AaKUvJ9eba3LJRpdAns=
+SIZE (arrow-0.15.5.tar.gz) = 82264
Index: pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/devel/py-arrow/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 27 Aug 2019 23:02:55 -0000 1.2
+++ pkg/PLIST 31 Mar 2020 18:52:59 -0000
@@ -1,4 +1,6 @@
@comment $OpenBSD: PLIST,v 1.2 2019/08/27 23:02:55 kmos Exp $
+@conflict py-arrow-*
+@pkgpath devel/py-arrow
lib/python${MODPY_VERSION}/site-packages/arrow/
lib/python${MODPY_VERSION}/site-packages/arrow-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/arrow-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
@@ -13,6 +15,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/arrow/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/arrow/${MODPY_PYCACHE}api.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/arrow/${MODPY_PYCACHE}arrow.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/arrow/${MODPY_PYCACHE}constants.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/arrow/${MODPY_PYCACHE}factory.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/arrow/${MODPY_PYCACHE}formatter.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/arrow/${MODPY_PYCACHE}locales.${MODPY_PYC_MAGIC_TAG}pyc
@@ -21,6 +24,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/arrow/_version.py
lib/python${MODPY_VERSION}/site-packages/arrow/api.py
lib/python${MODPY_VERSION}/site-packages/arrow/arrow.py
+lib/python${MODPY_VERSION}/site-packages/arrow/constants.py
lib/python${MODPY_VERSION}/site-packages/arrow/factory.py
lib/python${MODPY_VERSION}/site-packages/arrow/formatter.py
lib/python${MODPY_VERSION}/site-packages/arrow/locales.py
--
Paco Esteban.
0x5818130B8A6DBC03
