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

Added undescore to ignore new pydocstyle item (backport #428) #431

Merged
merged 2 commits into from
Jan 19, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jan 12, 2023

This is an automatic backport of pull request #428 done by Mergify.
Cherry-pick of ae431ed has failed:

On branch mergify/bp/foxy/pr-428
Your branch is up to date with 'origin/foxy'.

You are currently cherry-picking commit ae431ed.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   ament_pep257/ament_pep257/main.py

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* Added underscore to ignore new item

Signed-off-by: Crola1702 <cristobal.arroyo@ekumenlabs.com>
(cherry picked from commit ae431ed)

# Conflicts:
#	ament_pep257/ament_pep257/main.py
Signed-off-by: Crola1702 <cristobal.arroyo@ekumenlabs.com>
@Crola1702
Copy link
Contributor

CI:

  • Linux Build Status
  • Linux-aarch64 Build Status
  • Windows Build Status
  • Linux-rhel Build Status

@Crola1702
Copy link
Contributor

@clalancette I think this is ready to be merged

@clalancette
Copy link
Contributor

I'll do a new release of this today, and we'll consider a sync.

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.

2 participants