diff options
| author | Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2022-03-25 21:32:43 +0800 |
|---|---|---|
| committer | Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2022-03-25 21:38:16 +0800 |
| commit | b4937fd5c4b533c54cd664c00e48792d805b3cd0 (patch) | |
| tree | 05af3f8689c2749b9492ff713f42f5fd1d80dfec /math | |
| parent | mail/py-pyzmail: Fix CRLF in 25175022609f9e813aa168dd4dd848d6a9f61ac2 (diff) | |
math/py-pdal: Fix build with setuptools 58.0.0+
With hat: python
Diffstat (limited to 'math')
| -rw-r--r-- | math/py-pdal/Makefile | 2 | ||||
| -rw-r--r-- | math/py-pdal/files/patch-2to3 | 27 |
2 files changed, 29 insertions, 0 deletions
diff --git a/math/py-pdal/Makefile b/math/py-pdal/Makefile index 19fe41f8e920..af7da466456d 100644 --- a/math/py-pdal/Makefile +++ b/math/py-pdal/Makefile @@ -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 diff --git a/math/py-pdal/files/patch-2to3 b/math/py-pdal/files/patch-2to3 new file mode 100644 index 000000000000..055f6a9a3246 --- /dev/null +++ b/math/py-pdal/files/patch-2to3 @@ -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) |