Skip to content

Add dependency on ucs for pgf tests using [utf8x]{inputenc}. #18872

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

Merged
merged 1 commit into from
Nov 6, 2020

Conversation

anntzer
Copy link
Contributor

@anntzer anntzer commented Nov 2, 2020

ucs is a dependency of \usepackage[utf8x]{inputenc}, but if it
is absent we fail later with the slightly confusing error message
"Keyboard character used is undefined in inputencoding utf8x'" (as can be observed by temporarily uninstalling ucs). Instead, make the dependency explicit. Also, in test_rcupdate, only one of the two iterations uses [utf8x]{inputenc}`, so run the other iteration first
(giving it a chance to fail) and skip the test only at the second
iteration if needed.

PR Summary

PR Checklist

  • Has pytest style unit tests (and pytest passes).
  • Is Flake 8 compliant (run flake8 on changed files to check).
  • New features are documented, with examples if plot related.
  • Documentation is sphinx and numpydoc compliant (the docs should build without error).
  • Conforms to Matplotlib style conventions (install flake8-docstrings and run flake8 --docstring-convention=all).
  • New features have an entry in doc/users/next_whats_new/ (follow instructions in README.rst there).
  • API changes documented in doc/api/next_api_changes/ (follow instructions in README.rst there).

@@ -153,6 +153,10 @@ def test_rcupdate():
'\\usepackage{sfmath}')}]
tol = [6, 0]
for i, rc_set in enumerate(rc_sets):
if i == 1:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Less magical:

Suggested change
if i == 1:
if 'utf8x' in rc_set.get('pgf.preamble', ''):

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good idea, went for a variant of it.

`ucs` is a dependency of `\usepackage[utf8x]{inputenc}`, but if it
is absent we fail later with the slightly confusing error message
"Keyboard character used is undefined in inputencoding `utf8x'" (as
can be observed by temporarily uninstalling `ucs`).  Instead, make
the dependency explicit.  Also, in test_rcupdate, only one of the two
iterations uses `[utf8x]{inputenc}`, so run the other iteration first
(giving it a chance to fail) and skip the test only at the second
iteration if needed.
@@ -113,6 +113,7 @@ def test_xelatex():

# test compiling a figure to pdf with pdflatex
@needs_pdflatex
@pytest.mark.skipif(not _has_tex_package('ucs'), reason='needs ucs.sty')
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

did you mean to remove this line?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no? that test also needs ucs (and it's a single figure test so we can just use the decorator form)

@QuLogic QuLogic merged commit 61aec6e into matplotlib:master Nov 6, 2020
@anntzer anntzer deleted the pgftests branch November 6, 2020 10:20
@QuLogic QuLogic added this to the v3.4.0 milestone Jun 29, 2021
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.

4 participants