Skip to content

🧪 Use reusable-tox.yml @ tox-dev/workflow - #743

Merged
webknjaz merged 3 commits into
cherrypy:mainfrom
webknjaz:maintenance/reusable-tox
Apr 17, 2025
Merged

webknjaz merged 3 commits into
cherrypy:mainfrom
webknjaz:maintenance/reusable-tox

Conversation

@webknjaz

@webknjaz webknjaz commented Apr 9, 2025

Copy link
Copy Markdown
Member

What kind of change does this PR introduce?

  • 🐞 bug fix
  • 🐣 feature
  • 📋 docs update
  • 📋 tests/coverage improvement
  • 📋 refactoring
  • 💥 other

📋 What is the related issue number (starting with #)

N/A

What is the current behavior? (You can also link to an open issue here)

Copy-pasted CI setup

What is the new behavior (if this is a feature change)?

The tox-centric job reused and defined externally.

📋 Other information:

https://github.com/tox-dev/workflow

This patch temporarily skips integrating more jobs, like the changelog one.

📋 Contribution checklist:

(If you're a first-timer, check out
this guide on making great pull requests)

  • I wrote descriptive pull request text above
  • I think the code is well written
  • I wrote good commit messages
  • I have squashed related commits together after
    the changes have been approved
  • Unit tests for the changes exist
  • Integration tests for the changes exist (if applicable)
  • I used the same coding conventions as the rest of the project
  • The new code doesn't generate linter offenses
  • Documentation reflects the changes
  • The PR relates to only one subject with a clear title
    and description in grammatically correct, complete sentences

This change is Reviewable

@webknjaz webknjaz self-assigned this Apr 9, 2025
@webknjaz
webknjaz force-pushed the maintenance/reusable-tox branch 3 times, most recently from 0f0510f to 92ef85b Compare April 10, 2025 14:08
@codecov

codecov Bot commented Apr 10, 2025

Copy link
Copy Markdown

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 83.61%. Comparing base (173a630) to head (3fb6a1c).
Report is 1 commits behind head on main.

✅ All tests successful. No failed tests found.

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #743      +/-   ##
==========================================
+ Coverage   82.81%   83.61%   +0.79%     
==========================================
  Files          38       28      -10     
  Lines        4208     4168      -40     
==========================================
  Hits         3485     3485              
+ Misses        723      683      -40     

@webknjaz
webknjaz force-pushed the maintenance/reusable-tox branch 11 times, most recently from 4f5989a to 3fb6a1c Compare April 12, 2025 18:21
@webknjaz
webknjaz force-pushed the maintenance/reusable-tox branch from 3fb6a1c to ca4a765 Compare April 17, 2025 16:21
@webknjaz
webknjaz marked this pull request as ready for review April 17, 2025 16:22
@webknjaz
webknjaz merged commit 26d314a into cherrypy:main Apr 17, 2025
webknjaz added a commit that referenced this pull request Apr 17, 2025
@webknjaz webknjaz added backport-8.x 🤖 Trigger automatic backporting into the `maint/8.x` release branch by the Patchback robot backport-10.0.x 🤖 Trigger automatic backporting into the `maint/10.0.x` release branch by the Patchback robot labels Apr 29, 2025
@patchback

patchback Bot commented Apr 29, 2025

Copy link
Copy Markdown

Backport to maint/8.x: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 26d314a on top of patchback/backports/maint/8.x/26d314a2ad1d0cf806e89f31febabda9e6702c46/pr-743

Backporting merged PR #743 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/cherrypy/cheroot.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/maint/8.x/26d314a2ad1d0cf806e89f31febabda9e6702c46/pr-743 upstream/maint/8.x
  4. Now, cherry-pick PR 🧪 Use reusable-tox.yml @ tox-dev/workflow #743 contents into that branch:
    $ git cherry-pick -x 26d314a2ad1d0cf806e89f31febabda9e6702c46
    If it'll yell at you with something like fatal: Commit 26d314a2ad1d0cf806e89f31febabda9e6702c46 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 26d314a2ad1d0cf806e89f31febabda9e6702c46
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR 🧪 Use reusable-tox.yml @ tox-dev/workflow #743 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/maint/8.x/26d314a2ad1d0cf806e89f31febabda9e6702c46/pr-743
  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.

@patchback

patchback Bot commented Apr 29, 2025

Copy link
Copy Markdown

Backport to maint/10.0.x: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 26d314a on top of patchback/backports/maint/10.0.x/26d314a2ad1d0cf806e89f31febabda9e6702c46/pr-743

Backporting merged PR #743 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/cherrypy/cheroot.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/maint/10.0.x/26d314a2ad1d0cf806e89f31febabda9e6702c46/pr-743 upstream/maint/10.0.x
  4. Now, cherry-pick PR 🧪 Use reusable-tox.yml @ tox-dev/workflow #743 contents into that branch:
    $ git cherry-pick -x 26d314a2ad1d0cf806e89f31febabda9e6702c46
    If it'll yell at you with something like fatal: Commit 26d314a2ad1d0cf806e89f31febabda9e6702c46 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 26d314a2ad1d0cf806e89f31febabda9e6702c46
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR 🧪 Use reusable-tox.yml @ tox-dev/workflow #743 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/maint/10.0.x/26d314a2ad1d0cf806e89f31febabda9e6702c46/pr-743
  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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-8.x 🤖 Trigger automatic backporting into the `maint/8.x` release branch by the Patchback robot backport-10.0.x 🤖 Trigger automatic backporting into the `maint/10.0.x` release branch by the Patchback robot

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant