From nobody Fri Mar 31 05:15:25 2023 X-Original-To: dev-commits-ports-all@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 4PnpQP53xjz42vb6; Fri, 31 Mar 2023 05:15:25 +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 4PnpQP4WSpz42h5; Fri, 31 Mar 2023 05:15:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680239725; 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=f/xpR9Mebey1e6ULqH9JGNQPirquANiH1geF1jbB/Q8=; b=nID3xTjcTYNqk4P5e3ettjQGIlzhMv+EBguT0ylVcpOsqRpYl+RhaV0hiROHvtMHXP+Mdb YrWftJg4ziSkyPOL7Teml0sUljTY5Bk+Nr4K1C3apy+Av57nYYGXf2NfN1OQrp23mZTxbq Cj3flDCl1KrdsIrYST2OhD6k6ZArx8r7XeDHW3+rYUV7bTudyMudLzTUH6ZUMd2juzdIQk 41vZTxdfcsSmtVLbQVPKXG7aPBYNffG5AEYr5xKkWXkDtcpJUWZGo8H9kplUqRT8URKFi7 6yoaoVliTNddLp5qzIP2VBKRgfsRH/9iLOef7VU9ap0mBs1ua76ZKsRVJ9AUeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680239725; 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=f/xpR9Mebey1e6ULqH9JGNQPirquANiH1geF1jbB/Q8=; b=YdEcKQkIKtKQ3oQttpRCbjQ8fT7X7HxV13OUQ7wp/bJox/jbj6TtS6l4g5sg7P3afStpX8 VR4LcrbNr3VjuZmKAEhm4NDyL/hACwBTawxksSBqaMVOsIxN76fYNVGaenyZACm777mErl 0Iw05QCaBKvnhrGXFW+3/djf92SJ/erLrgFEHSH9yUDpzsJbX4zUMyZvRXi/lc5UyjKMOR iLtfZQBP33obWEgItEA606Fwe8ckgiJi4itmsxukM5i+VriGAzE5NaancwB/tX566wIvhr G8+Ch91u+C01oH996SOKBm3NBQYeyJIgLeRLBo1zkUOoOPwn1XCaHEX/izsKtg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680239725; a=rsa-sha256; cv=none; b=MqgVnKhwULuj3inYmSi+XHg39MQD+KwOiDRAAuq6JC2gdZ6V+x2bReGnjViG0w7V8wYUpl /dnKJw1MWzAmPoB4WtWdiT86rQmjDR39+pxk6UWdxc0jfD3Th1Qa2urplbijkjJQx7Svkh 4Rtm2cN4C/yfMZB/RFuVcQP6ipBmpTnvd31YW5rzA6BUfcVE/F4hCSoDhgWpBSxA/bopUa UmJAhWDdzuEuH6gTcrpD/9yBfXBeL02sCiOwbLxFvjTqRPBCkVSdelfPfNMiikhNY2GguJ rPyve6muuKvLcbkFtMzvtyQDqYOiXCssZGlPdjnWra21jowf2eX0O9MUvOmjMw== 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 4PnpQP3XsqzgkF; Fri, 31 Mar 2023 05:15:25 +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 32V5FPe1029500; Fri, 31 Mar 2023 05:15:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32V5FP58029499; Fri, 31 Mar 2023 05:15:25 GMT (envelope-from git) Date: Fri, 31 Mar 2023 05:15:25 GMT Message-Id: <202303310515.32V5FP58029499@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kai Knoblich Subject: git: 47216afd723b - main - graphics/py-img2pdf: Update to 0.4.4 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kai X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 47216afd723b71d9adc8d1a25241fd71a0de67cc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kai: URL: https://cgit.FreeBSD.org/ports/commit/?id=47216afd723b71d9adc8d1a25241fd71a0de67cc commit 47216afd723b71d9adc8d1a25241fd71a0de67cc Author: Kai Knoblich AuthorDate: 2023-03-31 05:12:45 +0000 Commit: Kai Knoblich CommitDate: 2023-03-31 05:12:45 +0000 graphics/py-img2pdf: Update to 0.4.4 * Add GUI option to reflect the requirements given in setup.py and to make use of the graphical frontend script. * Simplify "do-test" target by switching to USE_PYTHON=pytest. Changelog since 0.3.5 : https://gitlab.mister-muffin.de/josch/img2pdf/src/tag/0.4.4/CHANGES.rst --- graphics/py-img2pdf/Makefile | 29 ++++++++++++++++----- graphics/py-img2pdf/distinfo | 6 ++--- .../py-img2pdf/files/patch-src_img2pdf__test.py | 30 ++++++++++++++++++++++ 3 files changed, 55 insertions(+), 10 deletions(-) diff --git a/graphics/py-img2pdf/Makefile b/graphics/py-img2pdf/Makefile index 38934cc6752b..2cc72805d24d 100644 --- a/graphics/py-img2pdf/Makefile +++ b/graphics/py-img2pdf/Makefile @@ -1,5 +1,5 @@ PORTNAME= img2pdf -DISTVERSION= 0.3.5 +DISTVERSION= 0.4.4 CATEGORIES= graphics python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -11,15 +11,30 @@ WWW= https://gitlab.mister-muffin.de/josch/img2pdf LICENSE= LGPL3+ LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PY_PILLOW} -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pdfrw>0:textproc/py-pdfrw@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pikepdf>0:textproc/py-pikepdf@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} +TEST_DEPENDS= ${PY_NUMPY} \ + ${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \ + convert:graphics/ImageMagick6 \ + exiftool:graphics/p5-Image-ExifTool \ + jpegtopnm:graphics/netpbm \ + pdftocairo:graphics/poppler-utils -USES= python:3.5+ -USE_PYTHON= autoplist concurrent distutils +USES= python:3.5+ shebangfix +USE_PYTHON= autoplist concurrent distutils pytest +# Some tests fail, see following link for more info: +# https://gitlab.mister-muffin.de/josch/img2pdf/issues/152 +PYTEST_BROKEN_TESTS= jpg_cmyk tiff_cmyk8 +SHEBANG_FILES= src/img2pdf.py + +TEST_ENV= PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} NO_ARCH= yes -do-test: - @(cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test) +OPTIONS_DEFINE= GUI +OPTIONS_DEFAULT= GUI + +GUI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR} .include diff --git a/graphics/py-img2pdf/distinfo b/graphics/py-img2pdf/distinfo index 45058800a23c..fab177241c64 100644 --- a/graphics/py-img2pdf/distinfo +++ b/graphics/py-img2pdf/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1588236899 -SHA256 (img2pdf-0.3.5.tar.gz) = be676b5afebd3c55eb3f3edd9af1ff3e599fef89e91fbf2290b0259da58f1e19 -SIZE (img2pdf-0.3.5.tar.gz) = 83520 +TIMESTAMP = 1680120812 +SHA256 (img2pdf-0.4.4.tar.gz) = 8ec898a9646523fd3862b154f3f47cd52609c24cc3e2dc1fb5f0168f0cbe793c +SIZE (img2pdf-0.4.4.tar.gz) = 97796 diff --git a/graphics/py-img2pdf/files/patch-src_img2pdf__test.py b/graphics/py-img2pdf/files/patch-src_img2pdf__test.py new file mode 100644 index 000000000000..40e9379b63fd --- /dev/null +++ b/graphics/py-img2pdf/files/patch-src_img2pdf__test.py @@ -0,0 +1,30 @@ +Fix value errors for some tests: + +> psnr = float(psnr.strip(b"0")) +E ValueError: could not convert string to float: b'61.5441 (0.615441)' +src/img2pdf_test.py:347: ValueError + +Obtained from: + +https://gitlab.mister-muffin.de/josch/img2pdf/issues/152 + +--- src/img2pdf_test.py.orig 2023-03-30 18:01:47 UTC ++++ src/img2pdf_test.py +@@ -345,7 +345,7 @@ def compare(im1, im2, exact, icc, cmyk): + stderr=subprocess.PIPE, + ).stderr + assert psnr != b"0" +- psnr = float(psnr.strip(b"0")) ++ psnr = float(psnr.split()[0]) + assert psnr != 0 # or otherwise we would use the exact variant + assert psnr > 50 + +@@ -501,7 +501,7 @@ def compare_pdfimages_png(tmpdir, img, pdf, exact=True + stderr=subprocess.PIPE, + ).stderr + assert psnr != b"0" +- psnr = float(psnr.strip(b"0")) ++ psnr = float(psnr.split()[0]) + assert psnr != 0 # or otherwise we would use the exact variant + assert psnr > 50 + (tmpdir / "images-000.png").unlink()