From nobody Fri Mar 25 13:50:34 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id E232D1A343B7; Fri, 25 Mar 2022 13:50:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KQ3Q33mBfz3gym; Fri, 25 Mar 2022 13:50:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648216236; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c7T6bVGAF39dIIxDBBr4y9ZBAHd02qZ0FDkLBDQzrLY=; b=O6/zezXlbRlplSgTM/a7z8J5tjwtOz+tkjEZOPOJiF+74OEoPvCcul9iec4Sxg3ekOZh6p JFYqpD3KqFzn4nPGB4YFAUS5Cob0aHm2KUCdix3HT/H9Enx69QEr7TcAAkk6Xw6oaFKKnr g9JhXJdIJcVZtN4KxNbsT66dFPdcrBLwtxjch/BaUVA7pbyGAiLCErU62Re6JNRECNZRjE eYPi97e7uIycj8/WJEC0WJISSzgPuCHw6a1rhtSgdnfKpsJ+3ReQVhHC4syzWd3OXyWdq7 VtwGDd61stqYt4z5EP8fBGussU6HuKXk/sOWYXQOsy482OAbUd3ZPfcX7qpWwg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1EFCC58D6; Fri, 25 Mar 2022 13:50:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22PDoYKi037111; Fri, 25 Mar 2022 13:50:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22PDoYr8037110; Fri, 25 Mar 2022 13:50:34 GMT (envelope-from git) Date: Fri, 25 Mar 2022 13:50:34 GMT Message-Id: <202203251350.22PDoYr8037110@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: b4937fd5c4b5 - main - math/py-pdal: Fix build with setuptools 58.0.0+ List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b4937fd5c4b533c54cd664c00e48792d805b3cd0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648216236; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c7T6bVGAF39dIIxDBBr4y9ZBAHd02qZ0FDkLBDQzrLY=; b=gICxg8WDBeYUKS1RQdmMC1FxDtGePbYbLX+Bn50zowEYngr1YgbqAE8LmOVKLUTVhHQe/q e8tQSAj5cupy644Yudmi1UO+sCKnB+wUGSRti86mb3T2vj8o6dfwXrLpvHHebvKBnt541J 2bMWjLE5iVZ1U7VpgWL8sq5FvO3kRbGKdcGpEIZq4cmE3tYcTRjEznNKppEPeUhlbjOXat MMEI5l0Ai9OLTRajObXUXHsdzWpDOulj6XA9F88nDV9mjJq71ZJ1srLXjy3LkBNgd8TaH9 aIxLtu1EFmqsinQI1acHbMpe4+22D8Ar4RA4r3ojKC/JC5P9FRFoIz0qCDtYHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648216236; a=rsa-sha256; cv=none; b=VQoYh08zCYAt3Ta1KykTQqOPOvxa74HpDcqbxDdDs+LnUsOMZvHKAv7WU1521UVhB+LMKR mkVk1lbZI6ybpqrkbhamYnjaS7iD3wpRYNoX3JXFSEL94OOGD/mKEs/4ru/Y5Yh9c4vxU3 l+4ccgScsfpXLorsVCkYIKbbYE9FHBx5J1vPWoG+bBau5FhUWNG8GtbjsRuDChMgjvoJNK NULRaf/2zm+wjTw8OcbD92lOuANR9KetG1sg0hDmej22orMe+ii5pfhBjtgdz8erIbCSGB 9Lbg73NhVHW3VlRy1TEO4tes6QHomUw62BjA0WCj7jffigyHqpsfWAXuI/xLiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=b4937fd5c4b533c54cd664c00e48792d805b3cd0 commit b4937fd5c4b533c54cd664c00e48792d805b3cd0 Author: Po-Chuan Hsieh AuthorDate: 2022-03-25 13:32:43 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-03-25 13:38:16 +0000 math/py-pdal: Fix build with setuptools 58.0.0+ With hat: python --- math/py-pdal/Makefile | 2 ++ math/py-pdal/files/patch-2to3 | 27 +++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) 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)