search

pytest-dev / pytest

The pytest framework makes it easy to write small tests, yet scales to support complex functional testing
https://pytest.org
MIT License
11.95k stars 2.66k forks source link

Fix heading level on index.rst #12586

Closed timhoffm closed 3 months ago

timhoffm commented 3 months ago

"Security" was marked with a different heading level than all other entries on that page, effectively making it a subsection of "pytest for enterprise". This seems like an oversight. Security is not just for enterprises and should be on the same level as all other sections.

timhoffm commented 3 months ago

Since the change is trivial, I have not added a changelog entry (which I've read as optional in the PR template). However, CI complains. Should I still add a changelog or do you ignore the CI complaint?

nicoddemus commented 3 months ago

Should I still add a changelog or do you ignore the CI complaint?

Feel free to ignore, we can tell the bot its OK by adding a label (which I just did)

patchback[bot] commented 3 months ago

Backport to 8.2.x: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply d47972b680271fceff2b54208c0697de8e0d996a on top of patchback/backports/8.2.x/d47972b680271fceff2b54208c0697de8e0d996a/pr-12586

Backporting merged PR #12586 into 8.2.x

  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/pytest-dev/pytest.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/8.2.x/d47972b680271fceff2b54208c0697de8e0d996a/pr-12586 upstream/8.2.x
  4. Now, cherry-pick PR #12586 contents into that branch: 
    $ git cherry-pick -x d47972b680271fceff2b54208c0697de8e0d996a

    If it'll yell at you with something like fatal: Commit d47972b680271fceff2b54208c0697de8e0d996a is a merge but no -m option was given., add -m 1 as follows instead:

    $ git cherry-pick -m1 -x d47972b680271fceff2b54208c0697de8e0d996a
  5. At this point, you'll probably encounter some merge conflicts. You must resolve them in to preserve the patch from PR #12586 as close to the original as possible.
  6. Push this branch to your fork on GitHub: 
    $ git push origin patchback/backports/8.2.x/d47972b680271fceff2b54208c0697de8e0d996a/pr-12586
  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.