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

Cleanup tox configs and unit tests #2219

Merged

Conversation

tremble
Copy link
Contributor

@tremble tremble commented Jan 26, 2025

SUMMARY

As discussed in #2212 cleans up the unit tests to move importing some of the fixtures into conftest.py

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

ISSUE TYPE
  • Feature Pull Request
COMPONENT NAME

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

ADDITIONAL INFORMATION

Copy link
Contributor

Build succeeded.
https://ansible.softwarefactory-project.io/zuul/buildset/8d9fbe6234d94e4abf019c471b18bfd9

✔️ ansible-galaxy-importer SUCCESS in 3m 15s (non-voting)
✔️ build-ansible-collection SUCCESS in 10m 32s

Copy link
Contributor

Build succeeded.
https://ansible.softwarefactory-project.io/zuul/buildset/958ba46d2042412ea508c5581ba75a32

ansible-galaxy-importer FAILURE in 4m 44s (non-voting)
✔️ build-ansible-collection SUCCESS in 10m 13s

Copy link
Contributor

Build succeeded.
https://ansible.softwarefactory-project.io/zuul/buildset/02573db888f14cec86b8d4b9f0698628

ansible-galaxy-importer FAILURE in 5m 04s (non-voting)
✔️ build-ansible-collection SUCCESS in 10m 32s

Copy link
Contributor

Build succeeded.
https://ansible.softwarefactory-project.io/zuul/buildset/bcd190ea922341b1b9a2209c282a9e4d

✔️ ansible-galaxy-importer SUCCESS in 3m 22s (non-voting)
✔️ build-ansible-collection SUCCESS in 10m 24s

Copy link
Contributor

Build succeeded.
https://ansible.softwarefactory-project.io/zuul/buildset/77ce0f04854b4e4c8218db87db22871a

ansible-galaxy-importer FAILURE in 5m 07s (non-voting)
✔️ build-ansible-collection SUCCESS in 10m 27s

@tremble tremble requested a review from alinabuzachis January 28, 2025 13:06
Copy link
Contributor

Build succeeded.
https://ansible.softwarefactory-project.io/zuul/buildset/4639bc81581f4e6a9e3cbd909e8bc689

ansible-galaxy-importer FAILURE in 4m 16s (non-voting)
✔️ build-ansible-collection SUCCESS in 10m 53s

softwarefactory-project-zuul bot pushed a commit to ansible-collections/amazon.aws that referenced this pull request Jan 28, 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
@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/241e6fd787db409a8b3dae383d73f0b7

✔️ ansible-galaxy-importer SUCCESS in 3m 12s (non-voting)
✔️ build-ansible-collection SUCCESS in 10m 41s

@softwarefactory-project-zuul softwarefactory-project-zuul bot merged commit cfdcc05 into ansible-collections:main Jan 28, 2025
84 of 85 checks passed
Copy link

patchback bot commented Jan 28, 2025

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

❌ Failed to cleanly apply cfdcc05 on top of patchback/backports/stable-9/cfdcc05a27e8d56df294e5def845c5c9f4e0b2d7/pr-2219

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

GomathiselviS pushed a commit to ansible-collections/amazon.aws 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 to ansible-collections/amazon.aws 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 ansible-collections/amazon.aws 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 to ansible-collections/amazon.aws 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 <gomathiselvi@gmail.com>
tremble added a commit to tremble/community.aws that referenced this pull request Feb 3, 2025
SUMMARY
As discussed in ansible-collections#2212 cleans up the unit tests to move importing some of the fixtures into conftest.py
tox configs needed a little cleanup to ensure that things were consistently in the import path.
ISSUE TYPE

Feature Pull Request

COMPONENT NAME
pyproject.toml
tests/unit/conftest.py
tests/unit/plugins/
tox.ini
ADDITIONAL INFORMATION

Reviewed-by: Bikouo Aubin
softwarefactory-project-zuul bot pushed a commit that referenced this pull request Feb 3, 2025
This is a manual backport of PR #2219 as merged into main (cfdcc05).
SUMMARY
As discussed in #2212 cleans up the unit tests to move importing some of the fixtures into conftest.py tox configs needed a little cleanup to ensure that things were consistently in the import path
ISSUE TYPE

Feature Pull Request

COMPONENT NAME
pyproject.toml
tests/unit/conftest.py
tests/unit/plugins/
tox.ini
ADDITIONAL INFORMATION
Reviewed-by: Bikouo Aubin

Reviewed-by: GomathiselviS <gomathiselvi@gmail.com>
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)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants