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

Remove unneccessary imports #569

Merged
merged 3 commits into from
Feb 9, 2023

Conversation

felixfontein
Copy link
Contributor

SUMMARY

Prepare for ansible-collections/news-for-maintainers#34.

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

various

Copy link
Contributor

@kristianheljas kristianheljas left a comment

Choose a reason for hiding this comment

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

There doesn't seem to a good solution to ignoring single name from an import statement, it's fine as it is.

Everything else looks good!

Copy link
Contributor

@kristianheljas kristianheljas left a comment

Choose a reason for hiding this comment

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

Thanks @felixfontein for making it clear what needs to be ignored, LGTM!

@felixfontein felixfontein merged commit aea3713 into ansible-collections:main Feb 9, 2023
@patchback
Copy link

patchback bot commented Feb 9, 2023

Backport to stable-1: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply aea3713 on top of patchback/backports/stable-1/aea3713484547dbb227960f6b400b0fa60044993/pr-569

Backporting merged PR #569 into main

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/ansible-collections/community.crypto.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/stable-1/aea3713484547dbb227960f6b400b0fa60044993/pr-569 upstream/stable-1
  4. Now, cherry-pick PR Remove unneccessary imports #569 contents into that branch:
    $ git cherry-pick -x aea3713484547dbb227960f6b400b0fa60044993
    If it'll yell at you with something like fatal: Commit aea3713484547dbb227960f6b400b0fa60044993 is a merge but no -m option was given., add -m 1 as follows intead:
    $ git cherry-pick -m1 -x aea3713484547dbb227960f6b400b0fa60044993
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Remove unneccessary imports #569 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-1/aea3713484547dbb227960f6b400b0fa60044993/pr-569
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

@felixfontein felixfontein deleted the lint branch February 9, 2023 10:57
@felixfontein
Copy link
Contributor Author

@kristianheljas thanks a lot for reviewing this!

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