Hi,
here's an update to py-test 2.1.3, i already have an okay from benoit@
(MAINTAINER), but i tried hard to make it use MODPY_PYTEST, and that's
the second port where i fail hard (the other one was, iirc,
geo/py-fiona)
if i use MODPY_PYTEST, the $PWD isnt right, and the test infra doesnt
find the modules it needs:
============================= test session starts ==============================
platform openbsd6 -- Python 3.6.8, pytest-3.5.0, py-1.8.0, pluggy-0.6.0
rootdir: /usr/obj/ports/py-proj-2.1.3-python3/pyproj-2.1.3, inifile:
plugins: cov-2.5.1, hypothesis-3.55.1
collected 0 items / 11 errors
==================================== ERRORS ====================================
____________________ ERROR collecting test/test_awips221.py ____________________
ImportError while importing test module
'/usr/obj/ports/py-proj-2.1.3-python3/pyproj-2.1.3/test/test_awips221.py'.
Hint: make sure your test modules/packages have valid Python names.
Traceback:
test/test_awips221.py:7: in <module>
from pyproj import Proj
pyproj/__init__.py:62: in <module>
from pyproj.crs import CRS
pyproj/crs.py:26: in <module>
from pyproj._crs import _CRS, is_wkt
E ModuleNotFoundError: No module named 'pyproj._crs'
it will only work if i chdir to $WRKSRC/test (as is done in the port/diff, if i
try the same as in fiona (ie do-test: cd ${WRKSRC} && ${MODPY_BIN} -m pytest
test)
it fails the same. I also tried making it depend on itself via
TEST_DEPENDS=${BUILD_PKGPATH} but no luck.
what's wrong with pytest or py-proj here ?i
what can be done to make it work with MODPY_PYTEST, have an additional
arg MODPY_PYTEST_WORKDIR ? right now, MODPY_TEST_CMD is hardcoded to
MODPY_TEST_CMD = cd ${WRKSRC} && ${SETENV} ${ALL_TEST_ENV} ${MODPY_BIN}
and isnt overridable.
Thx for hints;
Landry
Index: Makefile
===================================================================
RCS file: /cvs/ports/geo/py-proj/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- Makefile 30 Dec 2018 13:50:07 -0000 1.21
+++ Makefile 22 Apr 2019 09:45:24 -0000
@@ -2,7 +2,7 @@
COMMENT = Pyrex generated python interface to PROJ.4 library
-MODPY_EGG_VERSION = 1.9.6
+MODPY_EGG_VERSION = 2.1.3
DISTNAME = pyproj-${MODPY_EGG_VERSION}
PKGNAME = ${DISTNAME:S/py/py-/}
@@ -15,11 +15,12 @@
# MIT
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB += ${MODPY_WANTLIB} pthread
+WANTLIB += ${MODPY_WANTLIB} proj pthread
MODULES = lang/python
MODPY_PI = Yes
+#MODPY_PYTEST = Yes
FLAVORS = python3
FLAVOR ?=
@@ -27,16 +28,13 @@
MODPY_SETUPTOOLS = Yes
BUILD_DEPENDS += ${RUN_DEPENDS}
-RUN_DEPENDS += devel/proj \
+RUN_DEPENDS += devel/proj>=6.0 \
math/py-numpy${MODPY_FLAVOR}
+#TEST_DEPENDS = ${BUILD_PKGPATH}
+#TEST_ENV = PYTHONPATH=${MODPY_SITEPKG}
do-test: fake
-.for t in test test2
-.if ${FLAVOR:Mpython3}
- sed -i.bak -e 's/print \(.*\)$$/print (\1)/; s/cPickle/pickle/'
${WRKSRC}/test/${t}.py
-.endif
- cd ${WRKSRC}/test && ${MAKE_ENV} \
- PYTHONPATH=${WRKINST}${MODPY_SITEPKG} ${MODPY_BIN} ./${t}.py
-.endfor
+# cd ${WRKSRC} && ${MODPY_BIN} -m pytest test
+ cd ${WRKSRC}/test && ${MODPY_BIN} ./test.py
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/geo/py-proj/distinfo,v
retrieving revision 1.9
diff -u -r1.9 distinfo
--- distinfo 30 Dec 2018 13:50:07 -0000 1.9
+++ distinfo 22 Apr 2019 09:45:24 -0000
@@ -1,2 +1,2 @@
-SHA256 (pyproj-1.9.6.tar.gz) = 4MArFVSyDHENFtZzgXsqif+Uc4sLU3rq2Oyy7cTESHs=
-SIZE (pyproj-1.9.6.tar.gz) = 2797999
+SHA256 (pyproj-2.1.3.tar.gz) = mcUniLAae7mogCS/TUCWXApmqT1lRgC13qz2RHdfQk0=
+SIZE (pyproj-2.1.3.tar.gz) = 521154
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/geo/py-proj/pkg/PLIST,v
retrieving revision 1.7
diff -u -r1.7 PLIST
--- pkg/PLIST 30 Oct 2017 12:56:23 -0000 1.7
+++ pkg/PLIST 22 Apr 2019 09:45:24 -0000
@@ -8,47 +8,24 @@
lib/python${MODPY_VERSION}/site-packages/pyproj/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pyproj/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/pyproj/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyproj/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyproj/${MODPY_PYCACHE}crs.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pyproj/${MODPY_PYCACHE}datadir.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyproj/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyproj/${MODPY_PYCACHE}geod.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyproj/${MODPY_PYCACHE}proj.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyproj/${MODPY_PYCACHE}transformer.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyproj/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyproj/_crs.so
+lib/python${MODPY_VERSION}/site-packages/pyproj/_datadir.so
+lib/python${MODPY_VERSION}/site-packages/pyproj/_geod.so
lib/python${MODPY_VERSION}/site-packages/pyproj/_proj.so
-lib/python${MODPY_VERSION}/site-packages/pyproj/data/
-lib/python${MODPY_VERSION}/site-packages/pyproj/data/FL
-lib/python${MODPY_VERSION}/site-packages/pyproj/data/GL27
-lib/python${MODPY_VERSION}/site-packages/pyproj/data/IGNF
-lib/python${MODPY_VERSION}/site-packages/pyproj/data/MD
-lib/python${MODPY_VERSION}/site-packages/pyproj/data/README
-lib/python${MODPY_VERSION}/site-packages/pyproj/data/TN
-lib/python${MODPY_VERSION}/site-packages/pyproj/data/WI
-lib/python${MODPY_VERSION}/site-packages/pyproj/data/WO
-lib/python${MODPY_VERSION}/site-packages/pyproj/data/alaska
-lib/python${MODPY_VERSION}/site-packages/pyproj/data/conus
-lib/python${MODPY_VERSION}/site-packages/pyproj/data/epsg
-lib/python${MODPY_VERSION}/site-packages/pyproj/data/esri
-lib/python${MODPY_VERSION}/site-packages/pyproj/data/esri.extra
-lib/python${MODPY_VERSION}/site-packages/pyproj/data/hawaii
-lib/python${MODPY_VERSION}/site-packages/pyproj/data/nad.lst
-lib/python${MODPY_VERSION}/site-packages/pyproj/data/nad27
-lib/python${MODPY_VERSION}/site-packages/pyproj/data/nad83
-lib/python${MODPY_VERSION}/site-packages/pyproj/data/ntf_r93.gsb
-lib/python${MODPY_VERSION}/site-packages/pyproj/data/ntv1_can.dat
-lib/python${MODPY_VERSION}/site-packages/pyproj/data/ntv2_out.dist
-lib/python${MODPY_VERSION}/site-packages/pyproj/data/null
-lib/python${MODPY_VERSION}/site-packages/pyproj/data/nzgd2kgrid0005.gsb
-lib/python${MODPY_VERSION}/site-packages/pyproj/data/other.extra
-lib/python${MODPY_VERSION}/site-packages/pyproj/data/pj_out27.dist
-lib/python${MODPY_VERSION}/site-packages/pyproj/data/pj_out83.dist
-lib/python${MODPY_VERSION}/site-packages/pyproj/data/proj_def.dat
-lib/python${MODPY_VERSION}/site-packages/pyproj/data/proj_outIGNF.dist
-lib/python${MODPY_VERSION}/site-packages/pyproj/data/prvi
-lib/python${MODPY_VERSION}/site-packages/pyproj/data/stgeorge
-lib/python${MODPY_VERSION}/site-packages/pyproj/data/stlrnc
-lib/python${MODPY_VERSION}/site-packages/pyproj/data/stpaul
-lib/python${MODPY_VERSION}/site-packages/pyproj/data/td_out.dist
-lib/python${MODPY_VERSION}/site-packages/pyproj/data/test27
-lib/python${MODPY_VERSION}/site-packages/pyproj/data/test83
-lib/python${MODPY_VERSION}/site-packages/pyproj/data/testIGNF
-lib/python${MODPY_VERSION}/site-packages/pyproj/data/testdatumfile
-lib/python${MODPY_VERSION}/site-packages/pyproj/data/testntv2
-lib/python${MODPY_VERSION}/site-packages/pyproj/data/testvarious
-lib/python${MODPY_VERSION}/site-packages/pyproj/data/tv_out.dist
-lib/python${MODPY_VERSION}/site-packages/pyproj/data/world
+lib/python${MODPY_VERSION}/site-packages/pyproj/_transformer.so
+lib/python${MODPY_VERSION}/site-packages/pyproj/compat.py
+lib/python${MODPY_VERSION}/site-packages/pyproj/crs.py
lib/python${MODPY_VERSION}/site-packages/pyproj/datadir.py
+lib/python${MODPY_VERSION}/site-packages/pyproj/exceptions.py
+lib/python${MODPY_VERSION}/site-packages/pyproj/geod.py
+lib/python${MODPY_VERSION}/site-packages/pyproj/proj.py
+lib/python${MODPY_VERSION}/site-packages/pyproj/transformer.py
+lib/python${MODPY_VERSION}/site-packages/pyproj/utils.py
