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

Synchronise tox configuration between amazon.aws and community.aws #2486

Merged

Conversation

tremble
Copy link
Contributor

@tremble tremble commented Jan 26, 2025

SUMMARY

tox configs needed a little cleanup to ensure that things were consistently in the import path when running pylint.

ISSUE TYPE
  • Feature Pull Request
COMPONENT NAME

pyproject.toml
tests/unit/conftest.py
tox.ini

ADDITIONAL INFORMATION

See also: ansible-collections/community.aws#2219

@tremble tremble requested a review from abikouo January 26, 2025 15:14
Copy link
Contributor

Copy link
Contributor

@tremble tremble force-pushed the tox/cleanup branch 2 times, most recently from 9275b39 to 0e5fc40 Compare January 28, 2025 11:33
Copy link
Contributor

Copy link
Contributor

@tremble tremble added the mergeit Merge the PR (SoftwareFactory) label Jan 28, 2025
Copy link
Contributor

Build succeeded (gate pipeline).
https://ansible.softwarefactory-project.io/zuul/buildset/aebdf4bb902444df923224f7e98470b2

✔️ ansible-galaxy-importer SUCCESS in 3m 36s
✔️ build-ansible-collection SUCCESS in 10m 09s

@softwarefactory-project-zuul softwarefactory-project-zuul bot merged commit 62ea880 into ansible-collections:main Jan 28, 2025
49 checks passed
Copy link

patchback bot commented Jan 28, 2025

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

❌ Failed to cleanly apply 62ea880 on top of patchback/backports/stable-9/62ea880c6c5bb78dfbe2134b03fa7138acb516ec/pr-2486

Backporting merged PR #2486 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/amazon.aws.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-9/62ea880c6c5bb78dfbe2134b03fa7138acb516ec/pr-2486 upstream/stable-9
  4. Now, cherry-pick PR Synchronise tox configuration between amazon.aws and community.aws #2486 contents into that branch:
    $ git cherry-pick -x 62ea880c6c5bb78dfbe2134b03fa7138acb516ec
    If it'll yell at you with something like fatal: Commit 62ea880c6c5bb78dfbe2134b03fa7138acb516ec is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 62ea880c6c5bb78dfbe2134b03fa7138acb516ec
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Synchronise tox configuration between amazon.aws and community.aws #2486 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-9/62ea880c6c5bb78dfbe2134b03fa7138acb516ec/pr-2486
  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.

@github-actions github-actions bot added the backport_failed Backport failed, needs review label Jan 28, 2025
GomathiselviS pushed a commit that referenced this pull request Jan 31, 2025
…2486)

SUMMARY
tox configs needed a little cleanup to ensure that things were consistently in the import path when running pylint.
ISSUE TYPE

Feature Pull Request

COMPONENT NAME
pyproject.toml
tests/unit/conftest.py
tox.ini
ADDITIONAL INFORMATION
See also: ansible-collections/community.aws#2219

Reviewed-by: Alina Buzachis
(cherry picked from commit 62ea880)
GomathiselviS pushed a commit that referenced this pull request Feb 3, 2025
…2486)

SUMMARY
tox configs needed a little cleanup to ensure that things were consistently in the import path when running pylint.
ISSUE TYPE

Feature Pull Request

COMPONENT NAME
pyproject.toml
tests/unit/conftest.py
tox.ini
ADDITIONAL INFORMATION
See also: ansible-collections/community.aws#2219

Reviewed-by: Alina Buzachis
(cherry picked from commit 62ea880)
tremble added a commit that referenced this pull request Feb 3, 2025
…2486)

SUMMARY
tox configs needed a little cleanup to ensure that things were consistently in the import path when running pylint.
ISSUE TYPE

Feature Pull Request

COMPONENT NAME
pyproject.toml
tests/unit/conftest.py
tox.ini
ADDITIONAL INFORMATION
See also: ansible-collections/community.aws#2219

Reviewed-by: Alina Buzachis
(cherry picked from commit 62ea880)
tremble added a commit to tremble/amazon.aws that referenced this pull request Feb 3, 2025
…nsible-collections#2486)

SUMMARY
tox configs needed a little cleanup to ensure that things were consistently in the import path when running pylint.
ISSUE TYPE

Feature Pull Request

COMPONENT NAME
pyproject.toml
tests/unit/conftest.py
tox.ini
ADDITIONAL INFORMATION
See also: ansible-collections/community.aws#2219

Reviewed-by: Alina Buzachis
(cherry picked from commit 62ea880)
softwarefactory-project-zuul bot pushed a commit that referenced this pull request Feb 3, 2025
…2486) (#2500)

SUMMARY
tox configs needed a little cleanup to ensure that things were consistently in the import path when running pylint.
ISSUE TYPE

Feature Pull Request

COMPONENT NAME
pyproject.toml
tests/unit/conftest.py
tox.ini
ADDITIONAL INFORMATION
See also: ansible-collections/community.aws#2219
Reviewed-by: Alina Buzachis
(cherry picked from commit 62ea880)

Reviewed-by: GomathiselviS <[email protected]>
@GomathiselviS GomathiselviS removed the backport_failed Backport failed, needs review label Feb 3, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-9 mergeit Merge the PR (SoftwareFactory) skip-changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants