Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade Raqm to 0.7.2 #5736

Merged
merged 2 commits into from Oct 12, 2021
Merged

Upgrade Raqm to 0.7.2 #5736

merged 2 commits into from Oct 12, 2021

Conversation

nulano
Copy link
Contributor

@nulano nulano commented Sep 27, 2021

See HOST-Oman/libraqm@v0.7.1...v0.7.2

Also add preprocessor definitions for supported FreeType and HarfBuzz features based on version.

@nulano
Copy link
Contributor Author

nulano commented Sep 27, 2021

Valgrind failure seems to be unrelated:

Tests/test_file_pdf.py::test_redos 
INTERNALERROR> Traceback (most recent call last):
INTERNALERROR>   File "/vpy3/lib/python3.8/site-packages/_pytest/main.py", line 269, in wrap_session
INTERNALERROR>     session.exitstatus = doit(config, session) or 0
INTERNALERROR>   File "/vpy3/lib/python3.8/site-packages/_pytest/main.py", line 323, in _main
INTERNALERROR>     config.hook.pytest_runtestloop(session=session)
INTERNALERROR>   File "/vpy3/lib/python3.8/site-packages/pluggy/_hooks.py", line 265, in __call__
INTERNALERROR>     return self._hookexec(self.name, self.get_hookimpls(), kwargs, firstresult)
INTERNALERROR>   File "/vpy3/lib/python3.8/site-packages/pluggy/_manager.py", line 80, in _hookexec
INTERNALERROR>     return self._inner_hookexec(hook_name, methods, kwargs, firstresult)
INTERNALERROR>   File "/vpy3/lib/python3.8/site-packages/pluggy/_callers.py", line 60, in _multicall
INTERNALERROR>     return outcome.get_result()
INTERNALERROR>   File "/vpy3/lib/python3.8/site-packages/pluggy/_result.py", line 60, in get_result
INTERNALERROR>     raise ex[1].with_traceback(ex[2])
INTERNALERROR>   File "/vpy3/lib/python3.8/site-packages/pluggy/_callers.py", line 39, in _multicall
INTERNALERROR>     res = hook_impl.function(*args)
INTERNALERROR>   File "/vpy3/lib/python3.8/site-packages/_pytest/main.py", line 348, in pytest_runtestloop
INTERNALERROR>     item.config.hook.pytest_runtest_protocol(item=item, nextitem=nextitem)
INTERNALERROR>   File "/vpy3/lib/python3.8/site-packages/pluggy/_hooks.py", line 265, in __call__
INTERNALERROR>     return self._hookexec(self.name, self.get_hookimpls(), kwargs, firstresult)
INTERNALERROR>   File "/vpy3/lib/python3.8/site-packages/pluggy/_manager.py", line 80, in _hookexec
INTERNALERROR>     return self._inner_hookexec(hook_name, methods, kwargs, firstresult)
INTERNALERROR>   File "/vpy3/lib/python3.8/site-packages/pluggy/_callers.py", line 60, in _multicall
INTERNALERROR>     return outcome.get_result()
INTERNALERROR>   File "/vpy3/lib/python3.8/site-packages/pluggy/_result.py", line 60, in get_result
INTERNALERROR>     raise ex[1].with_traceback(ex[2])
INTERNALERROR>   File "/vpy3/lib/python3.8/site-packages/pluggy/_callers.py", line 39, in _multicall
INTERNALERROR>     res = hook_impl.function(*args)
INTERNALERROR>   File "/vpy3/lib/python3.8/site-packages/_pytest/runner.py", line 109, in pytest_runtest_protocol
INTERNALERROR>     runtestprotocol(item, nextitem=nextitem)
INTERNALERROR>   File "/vpy3/lib/python3.8/site-packages/_pytest/runner.py", line 126, in runtestprotocol
INTERNALERROR>     reports.append(call_and_report(item, "call", log))
INTERNALERROR>   File "/vpy3/lib/python3.8/site-packages/_pytest/runner.py", line 219, in call_and_report
INTERNALERROR>     hook.pytest_runtest_logreport(report=report)
INTERNALERROR>   File "/vpy3/lib/python3.8/site-packages/pluggy/_hooks.py", line 265, in __call__
INTERNALERROR>     return self._hookexec(self.name, self.get_hookimpls(), kwargs, firstresult)
INTERNALERROR>   File "/vpy3/lib/python3.8/site-packages/pluggy/_manager.py", line 80, in _hookexec
INTERNALERROR>     return self._inner_hookexec(hook_name, methods, kwargs, firstresult)
INTERNALERROR>   File "/vpy3/lib/python3.8/site-packages/pluggy/_callers.py", line 60, in _multicall
INTERNALERROR>     return outcome.get_result()
INTERNALERROR>   File "/vpy3/lib/python3.8/site-packages/pluggy/_result.py", line 60, in get_result
INTERNALERROR>     raise ex[1].with_traceback(ex[2])
INTERNALERROR>   File "/vpy3/lib/python3.8/site-packages/pluggy/_callers.py", line 39, in _multicall
INTERNALERROR>     res = hook_impl.function(*args)
INTERNALERROR>   File "/vpy3/lib/python3.8/site-packages/_pytest/terminal.py", line 548, in pytest_runtest_logreport
INTERNALERROR>     self.write_ensure_prefix(line, word, **markup)
INTERNALERROR>   File "/vpy3/lib/python3.8/site-packages/_pytest/terminal.py", line 412, in write_ensure_prefix
INTERNALERROR>     self._tw.write(extra, **kwargs)
INTERNALERROR>   File "/vpy3/lib/python3.8/site-packages/_pytest/_io/terminalwriter.py", line 152, in write
INTERNALERROR>     msg = self.markup(msg, **markup)
INTERNALERROR>   File "/vpy3/lib/python3.8/site-packages/_pytest/_io/terminalwriter.py", line 104, in markup
INTERNALERROR>     text = "".join("\x1b[%sm" % cod for cod in esc) + text + "\x1b[0m"
INTERNALERROR>   File "/vpy3/lib/python3.8/site-packages/pytest_timeout.py", line 200, in handler
INTERNALERROR>     timeout_sigalrm(item, params.timeout)
INTERNALERROR>   File "/vpy3/lib/python3.8/site-packages/pytest_timeout.py", line 375, in timeout_sigalrm
INTERNALERROR>     pytest.fail("Timeout >%ss" % timeout)
INTERNALERROR>   File "/vpy3/lib/python3.8/site-packages/_pytest/outcomes.py", line 153, in fail
INTERNALERROR>     raise Failed(msg=msg, pytrace=pytrace)
INTERNALERROR> Failed: Timeout >1.0s

@radarhere
Copy link
Member

radarhere commented Sep 28, 2021

I reran Valgrind and it is passing now.

@wiredfool
Copy link
Member

That’s a timeout failure from a valgrind run, which is somewhat expected. Valgrind takes 10x the runtime, and if we have the timeouts tight for detection purposes, it’s going to trip there on a slower than normal run.

I’d only mostly worry if there’s an actual access error.

@hugovk hugovk merged commit 1cbb3f1 into python-pillow:master Oct 12, 2021
@nulano nulano deleted the raqm-0.7.2 branch October 12, 2021 14:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants