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

[DOC] move defaults in docs.py #3621

Merged
merged 21 commits into from Jul 8, 2023
Merged

[DOC] move defaults in docs.py #3621

merged 21 commits into from Jul 8, 2023

Conversation

Remi-Gau
Copy link
Collaborator

@Remi-Gau Remi-Gau commented Mar 24, 2023

Relates to #3519

Changes proposed in this pull request:

  • move where defaults are located in the templates arguments in docs.py
  • add info in contributing doc to show an example of a documented function:
  • minor style fixing (semantic line break, markup variables in doc strings)

@github-actions
Copy link
Contributor

github-actions bot commented Mar 24, 2023

👋 @Remi-Gau Thanks for creating a PR!

Until this PR is ready for review, you can include the [WIP] tag in its title, or leave it as a github draft.

Please make sure it is compliant with our contributing guidelines. In particular, be sure it checks the boxes listed below.

  • PR has an interpretable title.
  • PR links to Github issue with mention Closes #XXXX (see our documentation on PR structure)
  • Code is PEP8-compliant (see our documentation on coding style)
  • Changelog or what's new entry in doc/changes/latest.rst (see our documentation on PR structure)

For new features:

  • There is at least one unit test per new function / class (see our documentation on testing)
  • The new feature is demoed in at least one relevant example.

For bug fixes:

  • There is at least one test that would fail under the original bug conditions.

We will review it as quick as possible, feel free to ping us with questions if needed.

@Remi-Gau
Copy link
Collaborator Author

We can use this PR to start make sure we agree on where and how defaults should be reported and add an example in the contributing doc.

The changes here are supposed to reflect what was decided at the last maintainers meeting.

@codecov
Copy link

codecov bot commented Mar 24, 2023

Codecov Report

Merging #3621 (3dc9a46) into main (ea375e0) will not change coverage.
The diff coverage is 100.00%.

@@           Coverage Diff           @@
##             main    #3621   +/-   ##
=======================================
  Coverage   91.54%   91.54%           
=======================================
  Files         133      133           
  Lines       15629    15629           
  Branches     3250     3250           
=======================================
  Hits        14307    14307           
  Misses        774      774           
  Partials      548      548           
Flag Coverage Δ
macos-latest_3.10 91.46% <100.00%> (ø)
macos-latest_3.11 91.46% <100.00%> (ø)
macos-latest_3.8 91.42% <100.00%> (ø)
macos-latest_3.9 91.42% <100.00%> (ø)
ubuntu-latest_3.10 91.46% <100.00%> (ø)
ubuntu-latest_3.11 91.46% <100.00%> (ø)
ubuntu-latest_3.8 91.42% <100.00%> (ø)
ubuntu-latest_3.9 91.42% <100.00%> (ø)
windows-latest_3.10 91.40% <100.00%> (ø)
windows-latest_3.11 91.40% <100.00%> (ø)
windows-latest_3.8 91.37% <100.00%> (ø)
windows-latest_3.9 91.37% <100.00%> (ø)

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

Impacted Files Coverage Δ
nilearn/_utils/docs.py 92.18% <100.00%> (ø)

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

nilearn/_utils/docs.py Outdated Show resolved Hide resolved
nilearn/_utils/docs.py Outdated Show resolved Hide resolved
nilearn/_utils/docs.py Outdated Show resolved Hide resolved
nilearn/_utils/docs.py Outdated Show resolved Hide resolved
@Remi-Gau Remi-Gau added this to In progress in R&R (reformat and refactor) Mar 25, 2023
@Remi-Gau Remi-Gau marked this pull request as ready for review April 19, 2023 07:03
@Remi-Gau Remi-Gau changed the title [WIP][DOC] move defaults in docs.py [DOC] move defaults in docs.py Apr 19, 2023
@Remi-Gau
Copy link
Collaborator Author

the merge conflict is a headache: doing a hard reset on this one.

nilearn/_utils/docs.py Outdated Show resolved Hide resolved
nilearn/_utils/docs.py Outdated Show resolved Hide resolved
Copy link
Member

@ymzayek ymzayek left a comment

Choose a reason for hiding this comment

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

I started commenting the defaults that are not defined in docs.py but maybe a separate PR is needed to resolve these. There are 2 cases: defaults are not defined at all and defaults are set in the docstrings where the standard parameter is referenced

CONTRIBUTING.rst Outdated Show resolved Hide resolved
CONTRIBUTING.rst Outdated Show resolved Hide resolved
nilearn/_utils/docs.py Outdated Show resolved Hide resolved
nilearn/_utils/docs.py Outdated Show resolved Hide resolved
nilearn/_utils/docs.py Show resolved Hide resolved
nilearn/_utils/docs.py Show resolved Hide resolved
nilearn/_utils/docs.py Show resolved Hide resolved
nilearn/_utils/docs.py Outdated Show resolved Hide resolved
nilearn/_utils/docs.py Outdated Show resolved Hide resolved
Copy link
Member

@bthirion bthirion left a comment

Choose a reason for hiding this comment

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

LGTM otherwise

CONTRIBUTING.rst Outdated Show resolved Hide resolved
Remi-Gau and others added 7 commits April 24, 2023 14:37
Co-authored-by: bthirion <bertrand.thirion@inria.fr>
Co-authored-by: Yasmin <63292494+ymzayek@users.noreply.github.com>
Copy link
Member

@bthirion bthirion left a comment

Choose a reason for hiding this comment

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

LGTM otherwise.

CONTRIBUTING.rst Outdated Show resolved Hide resolved
Co-authored-by: bthirion <bertrand.thirion@inria.fr>
Copy link
Member

@bthirion bthirion left a comment

Choose a reason for hiding this comment

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

LGTM, thx.

Copy link
Member

@bthirion bthirion left a comment

Choose a reason for hiding this comment

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

LGTM.

@Remi-Gau Remi-Gau removed this from In progress in R&R (reformat and refactor) Jul 8, 2023
@Remi-Gau Remi-Gau merged commit 8c62868 into nilearn:main Jul 8, 2023
29 checks passed
@Remi-Gau Remi-Gau deleted the default branch July 8, 2023 15:08
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.

None yet

3 participants