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

Simplify checks like "x is not None or y is not None or z is not None" #2816

Merged
merged 6 commits into from
Nov 23, 2023

Conversation

michaelgrund
Copy link
Member

@michaelgrund michaelgrund commented Nov 17, 2023

Description of proposed changes

Related to #2757

  • text.py

Fixes #

Reminders

  • Run make format and make check to make sure the code follows the style guide.
  • Add tests for new features or tests that would have caught the bug that you're fixing.
  • Add new public functions/methods/classes to doc/api/index.rst.
  • Write detailed docstrings for all functions/methods.
  • If wrapping a new module, open a 'Wrap new GMT module' issue and submit reasonably-sized PRs.
  • If adding new functionality, add an example to docstrings or tutorials.
  • Use underscores (not hyphens) in names of Python files and directories.

Slash Commands

You can write slash commands (/command) in the first line of a comment to perform
specific operations. Supported slash commands are:

  • /format: automatically format and lint the code
  • /test-gmt-dev: run full tests on the latest GMT development version

@michaelgrund michaelgrund added the maintenance Boring but important stuff for the core devs label Nov 17, 2023
@michaelgrund michaelgrund added this to the 0.11.0 milestone Nov 17, 2023
@michaelgrund
Copy link
Member Author

Do we want to have this simplifications only for 3 checks like

x is not None or y is not None or z is not None:

or also for 2 checks like:

x is not None or y is not None:

?

@seisman
Copy link
Member

seisman commented Nov 17, 2023

also for 2 checks like:

x is not None or y is not None:

I feel it's not necessary to rewrite 2-checks.

Copy link
Member

@yvonnefroehlich yvonnefroehlich left a comment

Choose a reason for hiding this comment

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

Probably also the lines 194-197 can be rewritten using any:

pygmt/pygmt/src/text.py

Lines 192 to 200 in 579ad70

# Build the -F option in gmt text.
if kwargs.get("F") is None and (
position is not None
or angle is not None
or font is not None
or justify is not None
):
kwargs.update({"F": ""})

(I am sorry in case my post at #2757 (comment) was misleading. It was meant only as a question whether I understood this issue correctly, not as a complete update of the Figure.text method.)

@michaelgrund
Copy link
Member Author

/format

pygmt/src/text.py Outdated Show resolved Hide resolved
@michaelgrund
Copy link
Member Author

/format

pygmt/src/text.py Outdated Show resolved Hide resolved
@seisman seisman added the skip-changelog Skip adding Pull Request to changelog label Nov 23, 2023
@seisman seisman merged commit c40e785 into main Nov 23, 2023
15 checks passed
@seisman seisman deleted the simplify-is-none branch November 23, 2023 03:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
maintenance Boring but important stuff for the core devs skip-changelog Skip adding Pull Request to changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants