kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

math/py-pdal: Fix build with setuptools 58.0.0+

Browse source 
With hat:	python
This commit is contained in:
Po-Chuan Hsieh 2022-03-25 21:32:43 +08:00
parent f9eb1fc141
commit b4937fd5c4
No known key found for this signature in database
GPG key ID: 9A4BD10F002DD04B
2 changed files with 29 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
math/py-pdal/Makefile
View file

@ -24,6 +24,8 @@ USE_PYTHON= autoplist cython distutils
post-install:
${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}/libpdalpython*.so
${PYTHON_CMD} -m compileall -d ${PYTHON_SITELIBDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
${PYTHON_CMD} -O -m compileall -d ${PYTHON_SITELIBDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
do-test:
@cd ${WRKSRC} && py.test -v test

27
math/py-pdal/files/patch-2to3 Normal file
View file

@ -0,0 +1,27 @@
--- pdal/pipeline.py.orig 2021-11-24 10:30:42 UTC
+++ pdal/pipeline.py
@@ -1,5 +1,5 @@
-from __future__ import annotations
+
import json
import logging
from typing import Any, Container, Dict, Iterator, List, Optional, Sequence, Union, cast
@@ -19,7 +19,7 @@ LogLevelToPDAL = {
logging.INFO: 2,
logging.DEBUG: 8, # pdal::LogLevel::Debug5
}
-LogLevelFromPDAL = {v: k for k, v in LogLevelToPDAL.items()}
+LogLevelFromPDAL = {v: k for k, v in list(LogLevelToPDAL.items())}
class Pipeline(libpdalpython.Pipeline):
@@ -106,7 +106,7 @@ class Pipeline(libpdalpython.Pipeline):
if all(isinstance(stage, Reader) for stage in stages):
stages = [*stages, Filter.merge()]
for stage in stages:
- stage2tag[stage] = stage.tag or _generate_tag(stage, stage2tag.values())
+ stage2tag[stage] = stage.tag or _generate_tag(stage, list(stage2tag.values()))
options = stage.options
options["tag"] = stage2tag[stage]
inputs = _get_input_tags(stage, stage2tag)