Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Simplify curvilinear grid examples. #20626

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
Jul 17, 2021
Merged

Simplify curvilinear grid examples. #20626

merged 1 commit into from
Jul 17, 2021

Conversation

anntzer
Copy link
Contributor

@anntzer anntzer commented Jul 10, 2021

Since 8840d6e we ensure that x and y passed to tr and inv_tr
are already arrays (see the definition of
_UserTransform2D.transform_non_affine), so we don't need additional
casting-to-arrays.

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).

Comment on lines +30 to +31
def tr(x, y): return x, y - x
def inv_tr(x, y): return x, y + x
Copy link
Member

Choose a reason for hiding this comment

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

Style: I don't think we should put function bodies on the same line (and I'm surprised flake8 doesn't complain). Either give it proper line breaks (preferred), or inline them into `GridHelperCurveLinear using lambdas.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

One liners can be written together, see https://www.python.org/dev/peps/pep-0008/#blank-lines / PyCQA/pycodestyle#823. I can still spread things out if you prefer, just let me know.

@timhoffm
Copy link
Member

Test failure is real:

Traceback (most recent call last):
  File "/home/circleci/project/examples/axisartist/demo_curvelinear_grid.py", line 112, in <module>
    curvelinear_test1(fig)
  File "/home/circleci/project/examples/axisartist/demo_curvelinear_grid.py", line 41, in curvelinear_test1
    xx, yy = tr([3, 6], [5, 10])
  File "/home/circleci/project/examples/axisartist/demo_curvelinear_grid.py", line 30, in tr
    def tr(x, y): return x, y - x
TypeError: unsupported operand type(s) for -: 'list' and 'list

Copy link
Member

@timhoffm timhoffm left a comment

Choose a reason for hiding this comment

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

Test fails.

Since 8840d6e we ensure that `x` and `y` passed to `tr` and `inv_tr`
are already arrays (see the definition of
`_UserTransform2D.transform_non_affine`), so we don't need additional
casting-to-arrays.
@anntzer
Copy link
Contributor Author

anntzer commented Jul 17, 2021

Indeed, fixed.

@timhoffm timhoffm added this to the v3.5.0 milestone Jul 17, 2021
@timhoffm timhoffm dismissed their stale review July 17, 2021 20:35

fixed.

@timhoffm timhoffm merged commit 8af1a17 into matplotlib:master Jul 17, 2021
@anntzer anntzer deleted the utr branch July 17, 2021 21:04
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.

2 participants
Morty Proxy This is a proxified and sanitized view of the page, visit original site.