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 #5940

Merged
merged 4 commits into from
Feb 12, 2023
Merged

Conversation

felixfontein
Copy link
Collaborator

SUMMARY

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

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

various

@ansibullbot
Copy link
Collaborator

@felixfontein This PR was evaluated as a potentially problematic PR for the following reasons:

  • More than 50 changed files.

Such PR can only be merged by human. Contact a Core team member to review this PR on IRC: #ansible-devel on Libera.chat IRC

click here for bot help

@ansibullbot ansibullbot added bug This issue/PR relates to a bug needs_rebase https://docs.ansible.com/ansible/devel/dev_guide/developing_rebasing.html needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR labels Feb 4, 2023
@ansibullbot ansibullbot added the ci_verified Push fixes to PR branch to re-run CI label Feb 4, 2023
@ansibullbot ansibullbot removed the ci_verified Push fixes to PR branch to re-run CI label Feb 4, 2023
Copy link
Contributor

@mariolenz mariolenz left a comment

Choose a reason for hiding this comment

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

There are so many changes that it's hard to keep track of things. And, anyway, I don't know this collection very well. But it looks like you're ignoring some imports that really are unused. I couldn't find them anywhere else in plugins/.

Rest LGTM. But, as I've said, I don't know this collection very well. So maybe someone else should also have a look.

plugins/module_utils/dimensiondata.py Show resolved Hide resolved
plugins/module_utils/pure.py Show resolved Hide resolved
@felixfontein felixfontein merged commit 2b8ac3c into ansible-collections:main Feb 12, 2023
@patchback
Copy link

patchback bot commented Feb 12, 2023

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

❌ Failed to cleanly apply 2b8ac3c on top of patchback/backports/stable-4/2b8ac3c6292570e257c3aed9fc2d2550ccf736b1/pr-5940

Backporting merged PR #5940 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.general.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-4/2b8ac3c6292570e257c3aed9fc2d2550ccf736b1/pr-5940 upstream/stable-4
  4. Now, cherry-pick PR Remove unneccessary imports #5940 contents into that branch:
    $ git cherry-pick -x 2b8ac3c6292570e257c3aed9fc2d2550ccf736b1
    If it'll yell at you with something like fatal: Commit 2b8ac3c6292570e257c3aed9fc2d2550ccf736b1 is a merge but no -m option was given., add -m 1 as follows intead:
    $ git cherry-pick -m1 -x 2b8ac3c6292570e257c3aed9fc2d2550ccf736b1
  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 #5940 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-4/2b8ac3c6292570e257c3aed9fc2d2550ccf736b1/pr-5940
  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 12, 2023 18:48
@patchback
Copy link

patchback bot commented Feb 12, 2023

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

❌ Failed to cleanly apply 2b8ac3c on top of patchback/backports/stable-5/2b8ac3c6292570e257c3aed9fc2d2550ccf736b1/pr-5940

Backporting merged PR #5940 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.general.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-5/2b8ac3c6292570e257c3aed9fc2d2550ccf736b1/pr-5940 upstream/stable-5
  4. Now, cherry-pick PR Remove unneccessary imports #5940 contents into that branch:
    $ git cherry-pick -x 2b8ac3c6292570e257c3aed9fc2d2550ccf736b1
    If it'll yell at you with something like fatal: Commit 2b8ac3c6292570e257c3aed9fc2d2550ccf736b1 is a merge but no -m option was given., add -m 1 as follows intead:
    $ git cherry-pick -m1 -x 2b8ac3c6292570e257c3aed9fc2d2550ccf736b1
  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 #5940 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-5/2b8ac3c6292570e257c3aed9fc2d2550ccf736b1/pr-5940
  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
Copy link
Collaborator Author

@mariolenz thanks a lot for reviewing this!

@patchback
Copy link

patchback bot commented Feb 12, 2023

Backport to stable-6: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-6/2b8ac3c6292570e257c3aed9fc2d2550ccf736b1/pr-5940

Backported as #5976

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

patchback bot pushed a commit that referenced this pull request Feb 12, 2023
* Remove unneccessary imports.

* Keep unnecessary imports in module_utils - for now.

* Make older sanity tests shut up.

* Also make flake8 happier.

(cherry picked from commit 2b8ac3c)
felixfontein added a commit to felixfontein/community.general that referenced this pull request Feb 12, 2023
* Remove unneccessary imports.

* Keep unnecessary imports in module_utils - for now.

* Make older sanity tests shut up.

* Also make flake8 happier.

(cherry picked from commit 2b8ac3c)
@github-actions
Copy link

Docs Build 📝

Thank you for contribution!✨

This PR has been merged and your docs changes will be incorporated when they are next published.

felixfontein added a commit that referenced this pull request Feb 12, 2023
* Remove unneccessary imports (#5940)

* Remove unneccessary imports.

* Keep unnecessary imports in module_utils - for now.

* Make older sanity tests shut up.

* Also make flake8 happier.

(cherry picked from commit 2b8ac3c)

* Re-add os import.
felixfontein added a commit that referenced this pull request Feb 12, 2023
…5976)

Remove unneccessary imports (#5940)

* Remove unneccessary imports.

* Keep unnecessary imports in module_utils - for now.

* Make older sanity tests shut up.

* Also make flake8 happier.

(cherry picked from commit 2b8ac3c)

Co-authored-by: Felix Fontein <felix@fontein.de>
jikamens pushed a commit to jikamens/community.general that referenced this pull request Feb 25, 2023
* Remove unneccessary imports.

* Keep unnecessary imports in module_utils - for now.

* Make older sanity tests shut up.

* Also make flake8 happier.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug This issue/PR relates to a bug needs_rebase https://docs.ansible.com/ansible/devel/dev_guide/developing_rebasing.html needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants