media-gfx/img2pdf: Version bump to 0.5.1 #36678

gringus · 2024-05-14T18:49:14Z

Version bump to 0.5.1 for media-gfx/img2pdf
Dropped ppc64 arch due to dependency on media-libs/icc-profiles-openicc which is not supported on ppc64

Please check all the boxes that apply:

[*] I can submit this contribution in agreement with the Copyright Policy.
[*] I have certified the above via adding a Signed-off-by line to every commit in the pull request.
[*] This contribution has not been created with the assistance of Natural Language Processing artificial intelligence tools, in accordance with the AI policy.
[*] I have run pkgcheck scan --commits --net to check for issues with my commits.

Please note that all boxes must be checked for the pull request to be merged.

gentoo-bot · 2024-05-14T18:52:03Z

Pull Request assignment

Submitter: @gringus
Areas affected: ebuilds
Packages affected: media-gfx/img2pdf

media-gfx/img2pdf: @gentoo/proxy-maint (maintainer needed)

Linked bugs

Bugs linked: 921240

In order to force reassignment and/or bug reference scan, please append [please reassign] to the pull request title.

Docs: Code of Conduct ● Copyright policy (expl.) ● Devmanual ● GitHub PRs ● Proxy-maint guide

gentoo-repo-qa-bot · 2024-05-14T19:10:21Z

Pull request CI report

Report generated at: 2024-05-14 19:10 UTC
Newest commit scanned: c82d259
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/be76814190/output.html

media-gfx/img2pdf/img2pdf-0.5.1.ebuild

gentoo-repo-qa-bot · 2024-05-31T23:30:49Z

Pull request CI report

Report generated at: 2024-05-31 23:30 UTC
Newest commit scanned: 6a6b583
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/e141b2834a/output.html

media-gfx/img2pdf/img2pdf-0.5.1.ebuild

gentoo-repo-qa-bot · 2024-06-01T07:31:06Z

Pull request CI report

Report generated at: 2024-06-01 07:31 UTC
Newest commit scanned: d014b39
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/4ec3897e3f/output.html

gentoo-repo-qa-bot · 2024-06-01T08:40:45Z

Pull request CI report

Report generated at: 2024-06-01 08:40 UTC
Newest commit scanned: b83268b
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/0757766df9/output.html

mgorny

I'm getting more test failures:

FAILED src/img2pdf_test.py::test_miff_cmyk16[internal] - assert 6.35075 > 50
FAILED src/img2pdf_test.py::test_miff_cmyk16[pikepdf] - assert 6.35075 > 50

Do these two pass for you?

gringus · 2024-06-01T09:57:23Z

Yes, all pass.. interesting...

a17r · 2024-06-01T14:04:10Z

All passed here too: 341 passed, 8 skipped, 2 deselected in 41.02s

mgorny · 2024-06-01T14:39:34Z

Do these tests run at all for you? I don't have a single skip, so I'm guessing they could be skipped for you because of missing deps:

2 failed, 347 passed, 2 deselected in 116.59s (0:01:56)

Logs for failures:

_____________________________________________________ test_miff_cmyk16[internal] ______________________________________________________

tmp_path_factory = TempPathFactory(_given_basetemp=None, _trace=<pluggy._tracing.TagTracerSub object at 0x7f4909c630b0>, _basetemp=PosixP.../tmp/portage/media-gfx/img2pdf-0.5.1/temp/pytest-of-portage/pytest-0')
, _retention_count=0, _retention_policy='failed')
miff_cmyk16_img = PosixPath('/tmp/portage/media-gfx/img2pdf-0.5.1/temp/pytest-of-portage/pytest-0/miff_cmyk160/in.miff')
tiff_cmyk16_img = PosixPath('/tmp/portage/media-gfx/img2pdf-0.5.1/temp/pytest-of-portage/pytest-0/tiff_cmyk160/in.tiff')
miff_cmyk16_pdf = PosixPath('/tmp/portage/media-gfx/img2pdf-0.5.1/temp/pytest-of-portage/pytest-0/miff_cmyk16_pdf0/out.pdf')

    @pytest.mark.skipif(
        sys.platform in ["win32"],
        reason="test utilities not available on Windows and MacOS",
    )
    def test_miff_cmyk16(
        tmp_path_factory, miff_cmyk16_img, tiff_cmyk16_img, miff_cmyk16_pdf
    ):
        tmpdir = tmp_path_factory.mktemp("miff_cmyk16")
>       compare_ghostscript(
            tmpdir, tiff_cmyk16_img, miff_cmyk16_pdf, gsdevice="tiff32nc", exact=False
        )

miff_cmyk16_img = PosixPath('/tmp/portage/media-gfx/img2pdf-0.5.1/temp/pytest-of-portage/pytest-0/miff_cmyk160/in.miff')
miff_cmyk16_pdf = PosixPath('/tmp/portage/media-gfx/img2pdf-0.5.1/temp/pytest-of-portage/pytest-0/miff_cmyk16_pdf0/out.pdf')
tiff_cmyk16_img = PosixPath('/tmp/portage/media-gfx/img2pdf-0.5.1/temp/pytest-of-portage/pytest-0/tiff_cmyk160/in.tiff')
tmp_path_factory = TempPathFactory(_given_basetemp=None,
                _trace=<pluggy._tracing.TagTracerSub object at 0x7f4909c630b0>,
                _basetemp=PosixPath('/tmp/portage/media-gfx/img2pdf-0.5.1/temp/pytest-of-portage/pytest-0'),
                _retention_count=0,
                _retention_policy='failed')
tmpdir     = PosixPath('/tmp/portage/media-gfx/img2pdf-0.5.1/temp/pytest-of-portage/pytest-0/miff_cmyk161')

src/img2pdf_test.py:6422: 
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
src/img2pdf_test.py:418: in compare_ghostscript
    compare(str(img), str(tmpdir / "gs-1.") + ext, exact, icc, False)
        exact      = False
        ext        = 'tiff'
        gsdevice   = 'tiff32nc'
        icc        = False
        img        = PosixPath('/tmp/portage/media-gfx/img2pdf-0.5.1/temp/pytest-of-portage/pytest-0/tiff_cmyk160/in.tiff')
        pdf        = PosixPath('/tmp/portage/media-gfx/img2pdf-0.5.1/temp/pytest-of-portage/pytest-0/miff_cmyk16_pdf0/out.pdf')
        tmpdir     = PosixPath('/tmp/portage/media-gfx/img2pdf-0.5.1/temp/pytest-of-portage/pytest-0/miff_cmyk161')
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _

im1 = '/tmp/portage/media-gfx/img2pdf-0.5.1/temp/pytest-of-portage/pytest-0/tiff_cmyk160/in.tiff'
im2 = '/tmp/portage/media-gfx/img2pdf-0.5.1/temp/pytest-of-portage/pytest-0/miff_cmyk161/gs-1.tiff', exact = False, icc = False
cmyk = False

    def compare(im1, im2, exact, icc, cmyk):
        if exact:
            if cmyk and not HAVE_EXACT_CMYK8:
                raise Exception("cmyk cannot be exact before ImageMagick 7.1.0-48")
            elif icc:
                raise Exception("icc cannot be exact")
            else:
                subprocess.check_call(
                    COMPARE
                    + [
                        "-metric",
                        "AE",
                        "-alpha",
                        "off",
                        im1,
                        im2,
                        "null:",
                    ]
                )
        else:
            iccargs = []
            if icc:
                if ICC_PROFILE is None:
                    pytest.skip("Could not locate an ICC profile")
                iccargs = ["-profile", ICC_PROFILE]
            psnr = subprocess.run(
                COMPARE
                + iccargs
                + [
                    "-metric",
                    "PSNR",
                    im1,
                    im2,
                    "null:",
                ],
                check=False,
                stderr=subprocess.PIPE,
            ).stderr
            assert psnr != b"0"
            assert psnr != b"0 (0)"
            assert psnr_re.fullmatch(psnr) is not None, psnr
            psnr = psnr_re.fullmatch(psnr).group(1)
            psnr = float(psnr)
            assert psnr != 0  # or otherwise we would use the exact variant
>           assert psnr > 50
E           assert 6.35075 > 50
cmyk       = False
exact      = False
icc        = False
iccargs    = []
im1        = '/tmp/portage/media-gfx/img2pdf-0.5.1/temp/pytest-of-portage/pytest-0/tiff_cmyk160/in.tiff'
im2        = '/tmp/portage/media-gfx/img2pdf-0.5.1/temp/pytest-of-portage/pytest-0/miff_cmyk161/gs-1.tiff'
psnr       = 6.35075

src/img2pdf_test.py:396: AssertionError
______________________________________________________ test_miff_cmyk16[pikepdf] ______________________________________________________

tmp_path_factory = TempPathFactory(_given_basetemp=None, _trace=<pluggy._tracing.TagTracerSub object at 0x7f4909c630b0>, _basetemp=PosixP.../tmp/portage/media-gfx/img2pdf-0.5.1/temp/pytest-of-portage/pytest-0')
, _retention_count=0, _retention_policy='failed')
miff_cmyk16_img = PosixPath('/tmp/portage/media-gfx/img2pdf-0.5.1/temp/pytest-of-portage/pytest-0/miff_cmyk160/in.miff')
tiff_cmyk16_img = PosixPath('/tmp/portage/media-gfx/img2pdf-0.5.1/temp/pytest-of-portage/pytest-0/tiff_cmyk160/in.tiff')
miff_cmyk16_pdf = PosixPath('/tmp/portage/media-gfx/img2pdf-0.5.1/temp/pytest-of-portage/pytest-0/miff_cmyk16_pdf1/out.pdf')

    @pytest.mark.skipif(
        sys.platform in ["win32"],
        reason="test utilities not available on Windows and MacOS",
    )
    def test_miff_cmyk16(
        tmp_path_factory, miff_cmyk16_img, tiff_cmyk16_img, miff_cmyk16_pdf
    ):
        tmpdir = tmp_path_factory.mktemp("miff_cmyk16")
>       compare_ghostscript(
            tmpdir, tiff_cmyk16_img, miff_cmyk16_pdf, gsdevice="tiff32nc", exact=False
        )

miff_cmyk16_img = PosixPath('/tmp/portage/media-gfx/img2pdf-0.5.1/temp/pytest-of-portage/pytest-0/miff_cmyk160/in.miff')
miff_cmyk16_pdf = PosixPath('/tmp/portage/media-gfx/img2pdf-0.5.1/temp/pytest-of-portage/pytest-0/miff_cmyk16_pdf1/out.pdf')
tiff_cmyk16_img = PosixPath('/tmp/portage/media-gfx/img2pdf-0.5.1/temp/pytest-of-portage/pytest-0/tiff_cmyk160/in.tiff')
tmp_path_factory = TempPathFactory(_given_basetemp=None,
                _trace=<pluggy._tracing.TagTracerSub object at 0x7f4909c630b0>,
                _basetemp=PosixPath('/tmp/portage/media-gfx/img2pdf-0.5.1/temp/pytest-of-portage/pytest-0'),
                _retention_count=0,
                _retention_policy='failed')
tmpdir     = PosixPath('/tmp/portage/media-gfx/img2pdf-0.5.1/temp/pytest-of-portage/pytest-0/miff_cmyk162')

src/img2pdf_test.py:6422: 
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
src/img2pdf_test.py:418: in compare_ghostscript
    compare(str(img), str(tmpdir / "gs-1.") + ext, exact, icc, False)
        exact      = False
        ext        = 'tiff'
        gsdevice   = 'tiff32nc'
        icc        = False
        img        = PosixPath('/tmp/portage/media-gfx/img2pdf-0.5.1/temp/pytest-of-portage/pytest-0/tiff_cmyk160/in.tiff')
        pdf        = PosixPath('/tmp/portage/media-gfx/img2pdf-0.5.1/temp/pytest-of-portage/pytest-0/miff_cmyk16_pdf1/out.pdf')
        tmpdir     = PosixPath('/tmp/portage/media-gfx/img2pdf-0.5.1/temp/pytest-of-portage/pytest-0/miff_cmyk162')
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _

im1 = '/tmp/portage/media-gfx/img2pdf-0.5.1/temp/pytest-of-portage/pytest-0/tiff_cmyk160/in.tiff'
im2 = '/tmp/portage/media-gfx/img2pdf-0.5.1/temp/pytest-of-portage/pytest-0/miff_cmyk162/gs-1.tiff', exact = False, icc = False
cmyk = False

    def compare(im1, im2, exact, icc, cmyk):
        if exact:
            if cmyk and not HAVE_EXACT_CMYK8:
                raise Exception("cmyk cannot be exact before ImageMagick 7.1.0-48")
            elif icc:
                raise Exception("icc cannot be exact")
            else:
                subprocess.check_call(
                    COMPARE
                    + [
                        "-metric",
                        "AE",
                        "-alpha",
                        "off",
                        im1,
                        im2,
                        "null:",
                    ]
                )
        else:
            iccargs = []
            if icc:
                if ICC_PROFILE is None:
                    pytest.skip("Could not locate an ICC profile")
                iccargs = ["-profile", ICC_PROFILE]
            psnr = subprocess.run(
                COMPARE
                + iccargs
                + [
                    "-metric",
                    "PSNR",
                    im1,
                    im2,
                    "null:",
                ],
                check=False,
                stderr=subprocess.PIPE,
            ).stderr
            assert psnr != b"0"
            assert psnr != b"0 (0)"
            assert psnr_re.fullmatch(psnr) is not None, psnr
            psnr = psnr_re.fullmatch(psnr).group(1)
            psnr = float(psnr)
            assert psnr != 0  # or otherwise we would use the exact variant
>           assert psnr > 50
E           assert 6.35075 > 50

cmyk       = False
exact      = False
icc        = False
iccargs    = []
im1        = '/tmp/portage/media-gfx/img2pdf-0.5.1/temp/pytest-of-portage/pytest-0/tiff_cmyk160/in.tiff'
im2        = '/tmp/portage/media-gfx/img2pdf-0.5.1/temp/pytest-of-portage/pytest-0/miff_cmyk162/gs-1.tiff'
psnr       = 6.35075

src/img2pdf_test.py:396: AssertionError

gringus · 2024-06-01T19:23:53Z

I get 349 passed, 2 deselected in 33.11s I'm using ebuildtester to test it.

gringus · 2024-06-01T19:40:01Z

Pkease try the patch from https://gitlab.mister-muffin.de/josch/img2pdf/issues/178 and see if that helps.

mgorny · 2024-06-02T02:39:57Z

The NixOS patch? It's for cmyk8 cases only. The author even notes that cmyk16 cases still fail for them after applying it.

Perhaps it's ImageMagick flags? I've got 7.1.1.25, USE="X bzip2 cxx djvu fftw fontconfig fpx hdri heif jbig jpeg jpeg2k jpegxl lcms lqr lzma openexr openmp pango perl png postscript raw svg tiff truetype webp wmf xml zlib".

mgorny · 2024-06-02T14:39:27Z

If I limit the flags to absolute minimum, the tests pass. I'm going to try different flag combinations to figure out which one causes the problem.

mgorny · 2024-06-02T14:46:32Z

Ok, it's USE=hdri. Let's just add these two tests to deselect (possibly with if has_version 'media-gfx/imagemagick[hdri]), no point in forcing it off for the sake of tests.

Signed-off-by: Marcin Deranek <marcin.deranek@slonko.net> Co-authored-by: Michał Górny <mgorny@gentoo.org> Closes: https://bugs.gentoo.org/921240 Closes: https://bugs.gentoo.org/929621

gentoo-repo-qa-bot · 2024-06-03T22:10:56Z

Pull request CI report

Report generated at: 2024-06-03 22:10 UTC
Newest commit scanned: 97670d8
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/5b59d88ef5/output.html

mgorny

Thanks. I'm going to add xdist back, because the tests are slow, then push and open rekeywording.

mgorny · 2024-06-04T05:39:46Z

Do you want to maintain it going forward, by the way?

gringus · 2024-06-04T12:44:38Z

Not really. I removed xdist as I did not see any difference running tests with or without it.

gentoo-bot added maintainer-needed There is at least one affected package with no maintainer. Review it if you can. assigned PR successfully assigned to the package maintainer(s). bug linked Bug/Closes found in footer, and cross-linked with the PR. labels May 14, 2024

a17r suggested changes May 31, 2024

View reviewed changes

media-gfx/img2pdf/img2pdf-0.5.1.ebuild Outdated Show resolved Hide resolved

gringus force-pushed the bug-921240 branch 2 times, most recently from 7ec277f to 6a6b583 Compare May 31, 2024 22:28

mgorny requested changes Jun 1, 2024

View reviewed changes

gringus force-pushed the bug-921240 branch from d014b39 to b83268b Compare June 1, 2024 08:17

mgorny reviewed Jun 1, 2024

View reviewed changes

media-gfx/img2pdf: Version bump to 0.5.1

97670d8

Signed-off-by: Marcin Deranek <marcin.deranek@slonko.net> Co-authored-by: Michał Górny <mgorny@gentoo.org> Closes: https://bugs.gentoo.org/921240 Closes: https://bugs.gentoo.org/929621

gringus force-pushed the bug-921240 branch from b83268b to 97670d8 Compare June 3, 2024 20:21

gringus requested a review from mgorny June 3, 2024 21:57

mgorny approved these changes Jun 4, 2024

View reviewed changes

gentoo-bot closed this in f097d26 Jun 4, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

media-gfx/img2pdf: Version bump to 0.5.1 #36678

media-gfx/img2pdf: Version bump to 0.5.1 #36678

gringus commented May 14, 2024

gentoo-bot commented May 14, 2024

gentoo-repo-qa-bot commented May 14, 2024

gentoo-repo-qa-bot commented May 31, 2024

gentoo-repo-qa-bot commented Jun 1, 2024

gentoo-repo-qa-bot commented Jun 1, 2024

mgorny left a comment

gringus commented Jun 1, 2024

a17r commented Jun 1, 2024

mgorny commented Jun 1, 2024

gringus commented Jun 1, 2024 •

edited

gringus commented Jun 1, 2024

mgorny commented Jun 2, 2024

mgorny commented Jun 2, 2024

mgorny commented Jun 2, 2024

gentoo-repo-qa-bot commented Jun 3, 2024

mgorny left a comment

mgorny commented Jun 4, 2024

gringus commented Jun 4, 2024

media-gfx/img2pdf: Version bump to 0.5.1 #36678

media-gfx/img2pdf: Version bump to 0.5.1 #36678

Conversation

gringus commented May 14, 2024

gentoo-bot commented May 14, 2024

Pull Request assignment

Linked bugs

gentoo-repo-qa-bot commented May 14, 2024

Pull request CI report

gentoo-repo-qa-bot commented May 31, 2024

Pull request CI report

gentoo-repo-qa-bot commented Jun 1, 2024

Pull request CI report

gentoo-repo-qa-bot commented Jun 1, 2024

Pull request CI report

mgorny left a comment

Choose a reason for hiding this comment

gringus commented Jun 1, 2024

a17r commented Jun 1, 2024

mgorny commented Jun 1, 2024

gringus commented Jun 1, 2024 • edited

gringus commented Jun 1, 2024

mgorny commented Jun 2, 2024

mgorny commented Jun 2, 2024

mgorny commented Jun 2, 2024

gentoo-repo-qa-bot commented Jun 3, 2024

Pull request CI report

mgorny left a comment

Choose a reason for hiding this comment

mgorny commented Jun 4, 2024

gringus commented Jun 4, 2024

gringus commented Jun 1, 2024 •

edited