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

Format documentation #2111

Merged
merged 7 commits into from
Oct 18, 2024
Merged

Format documentation #2111

merged 7 commits into from
Oct 18, 2024

Conversation

huiyuxie
Copy link
Member

See title.

@huiyuxie huiyuxie requested a review from ranocha October 14, 2024 21:54
Copy link
Contributor

Review checklist

This checklist is meant to assist creators of PRs (to let them know what reviewers will typically look for) and reviewers (to guide them in a structured review process). Items do not need to be checked explicitly for a PR to be eligible for merging.

Purpose and scope

  • The PR has a single goal that is clear from the PR title and/or description.
  • All code changes represent a single set of modifications that logically belong together.
  • No more than 500 lines of code are changed or there is no obvious way to split the PR into multiple PRs.

Code quality

  • The code can be understood easily.
  • Newly introduced names for variables etc. are self-descriptive and consistent with existing naming conventions.
  • There are no redundancies that can be removed by simple modularization/refactoring.
  • There are no leftover debug statements or commented code sections.
  • The code adheres to our conventions and style guide, and to the Julia guidelines.

Documentation

  • New functions and types are documented with a docstring or top-level comment.
  • Relevant publications are referenced in docstrings (see example for formatting).
  • Inline comments are used to document longer or unusual code sections.
  • Comments describe intent ("why?") and not just functionality ("what?").
  • If the PR introduces a significant change or new feature, it is documented in NEWS.md with its PR number.

Testing

  • The PR passes all tests.
  • New or modified lines of code are covered by tests.
  • New or modified tests run in less then 10 seconds.

Performance

  • There are no type instabilities or memory allocations in performance-critical parts.
  • If the PR intent is to improve performance, before/after time measurements are posted in the PR.

Verification

  • The correctness of the code was verified using appropriate tests.
  • If new equations/methods are added, a convergence test has been run and the results
    are posted in the PR.

Created with ❤️ by the Trixi.jl community.

@ranocha
Copy link
Member

ranocha commented Oct 15, 2024

Thanks for initiating this. Did you review all the changes?

@JoshuaLampert
Copy link
Member

When we do this, we could also think of using https://github.com/julia-actions/julia-format. This enables automatic suggestions in PRs based on the output of the formatter.

@huiyuxie
Copy link
Member Author

huiyuxie commented Oct 15, 2024

Did you review all the changes?

@ranocha Most changes are about extra spaces. If you don't want this format applied to the docs, please remove the docs path from trixi-format.jl.

@huiyuxie
Copy link
Member Author

@JoshuaLampert It seems tedious to trigger a new PR each time for formatting - I prefer to manually run the formatter.

@JoshuaLampert
Copy link
Member

The julia-format action does not create new PRs, but adds suggestions to already existing PRs, which do not follow the formatting rules. I.e. everything you can do without this action is the same as with the action plus you get suggestions, which you just need to accept by clicking on the corresponding button in the GitHub interface. So if you forgot to format it locally, IMO this makes it a little bit more convenient.

Copy link
Member

@JoshuaLampert JoshuaLampert left a comment

Choose a reason for hiding this comment

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

I am in favor of formatting docs/. Although these are mostly white space changes, I think there are some small issues that should be fixed. See some comments below.

docs/literate/src/files/adding_new_scalar_equations.jl Outdated Show resolved Hide resolved
docs/literate/src/files/adding_new_scalar_equations.jl Outdated Show resolved Hide resolved
docs/literate/src/files/adding_new_scalar_equations.jl Outdated Show resolved Hide resolved
docs/literate/src/files/adding_new_scalar_equations.jl Outdated Show resolved Hide resolved
docs/literate/src/files/adding_new_scalar_equations.jl Outdated Show resolved Hide resolved
docs/literate/src/files/adding_nonconservative_equation.jl Outdated Show resolved Hide resolved
docs/literate/src/files/adding_nonconservative_equation.jl Outdated Show resolved Hide resolved
docs/literate/src/files/custom_semidiscretization.jl Outdated Show resolved Hide resolved
Copy link
Member

@ranocha ranocha left a comment

Choose a reason for hiding this comment

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

Thanks for your PR. I agree with @JoshuaLampert - the whitespace changes are fine, but the changes related to comments should be improved in some cases.

@huiyuxie
Copy link
Member Author

I see. Thanks for reviewing @JoshuaLampert @ranocha! I changed the comments based on your comments and also added format to CI. Please check again.

Copy link

codecov bot commented Oct 17, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 96.36%. Comparing base (00ef308) to head (1352147).

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #2111   +/-   ##
=======================================
  Coverage   96.36%   96.36%           
=======================================
  Files         477      477           
  Lines       37750    37750           
=======================================
  Hits        36376    36376           
  Misses       1374     1374           
Flag Coverage Δ
unittests 96.36% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Member

@ranocha ranocha left a comment

Choose a reason for hiding this comment

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

.github/workflows/Format.yml Outdated Show resolved Hide resolved
@huiyuxie
Copy link
Member Author

huiyuxie commented Oct 17, 2024

Could you please also update the section https://trixi-framework.github.io/Trixi.jl/stable/styleguide/#automated-source-code-formatting of the docs?

What do you mean - add docs formatting section? Why? Formatting docs is the same as formatting other things.

@huiyuxie
Copy link
Member Author

huiyuxie commented Oct 17, 2024

Review again @ranocha - I am not sure what you mean but I added docs.

@JoshuaLampert
Copy link
Member

Thanks @huiyuxie. If you click on the above link, which Hendrik posted, you will see that we have a section in our docs explaining the automated formatting and how to format the code. There it says, e.g.,

julia -e 'using JuliaFormatter; format(["benchmark", "examples", "ext", "src", "test", "utils"])'

This is outdated with the current PR because this does not format the docs folder. You could replace that by

julia -e 'using JuliaFormatter; format(".")'

@huiyuxie
Copy link
Member Author

Thanks @JoshuaLampert!

Copy link
Member

@JoshuaLampert JoshuaLampert left a comment

Choose a reason for hiding this comment

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

Thanks!

docs/src/styleguide.md Show resolved Hide resolved
Copy link
Member

@ranocha ranocha left a comment

Choose a reason for hiding this comment

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

Thanks a lot!

@ranocha ranocha merged commit 7d92aaf into trixi-framework:main Oct 18, 2024
6 of 7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants