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

Explain the importance of reproducers #9053

Merged
merged 2 commits into from
Sep 7, 2024
Merged

Explain the importance of reproducers #9053

merged 2 commits into from
Sep 7, 2024

Conversation

Dreamsorcerer
Copy link
Member

No description provided.

@Dreamsorcerer Dreamsorcerer added bot:chronographer:skip This PR does not need to include a change note backport-3.10 Trigger automatic backporting to the 3.10 release branch by Patchback robot backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot labels Sep 7, 2024
Copy link

codecov bot commented Sep 7, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.30%. Comparing base (684b792) to head (2fda9e0).
Report is 2 commits behind head on master.

✅ All tests successful. No failed tests found.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #9053   +/-   ##
=======================================
  Coverage   98.30%   98.30%           
=======================================
  Files         107      107           
  Lines       34356    34356           
  Branches     4071     4071           
=======================================
  Hits        33772    33772           
  Misses        412      412           
  Partials      172      172           
Flag Coverage Δ
CI-GHA 98.19% <ø> (ø)
OS-Linux 97.85% <ø> (ø)
OS-Windows 96.26% <ø> (ø)
OS-macOS 97.53% <ø> (+<0.01%) ⬆️
Py-3.10.11 97.63% <ø> (ø)
Py-3.10.14 97.56% <ø> (ø)
Py-3.11.9 97.79% <ø> (ø)
Py-3.12.5 97.91% <ø> (ø)
Py-3.9.13 97.51% <ø> (ø)
Py-3.9.19 97.46% <ø> (ø)
Py-pypy7.3.16 97.07% <ø> (ø)
VM-macos 97.53% <ø> (+<0.01%) ⬆️
VM-ubuntu 97.85% <ø> (ø)
VM-windows 96.26% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@bdraco bdraco merged commit 5f5a4d2 into master Sep 7, 2024
34 of 35 checks passed
@bdraco bdraco deleted the Dreamsorcerer-patch-6 branch September 7, 2024 20:54
Copy link
Contributor

patchback bot commented Sep 7, 2024

Backport to 3.10: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 5f5a4d2 on top of patchback/backports/3.10/5f5a4d2c320f071391a0c47ecedaf507bcb9a469/pr-9053

Backporting merged PR #9053 into master

  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/aio-libs/aiohttp.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/3.10/5f5a4d2c320f071391a0c47ecedaf507bcb9a469/pr-9053 upstream/3.10
  4. Now, cherry-pick PR Explain the importance of reproducers #9053 contents into that branch:
    $ git cherry-pick -x 5f5a4d2c320f071391a0c47ecedaf507bcb9a469
    If it'll yell at you with something like fatal: Commit 5f5a4d2c320f071391a0c47ecedaf507bcb9a469 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 5f5a4d2c320f071391a0c47ecedaf507bcb9a469
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Explain the importance of reproducers #9053 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.10/5f5a4d2c320f071391a0c47ecedaf507bcb9a469/pr-9053
  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.

Copy link
Contributor

patchback bot commented Sep 7, 2024

Backport to 3.11: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 5f5a4d2 on top of patchback/backports/3.11/5f5a4d2c320f071391a0c47ecedaf507bcb9a469/pr-9053

Backporting merged PR #9053 into master

  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/aio-libs/aiohttp.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/3.11/5f5a4d2c320f071391a0c47ecedaf507bcb9a469/pr-9053 upstream/3.11
  4. Now, cherry-pick PR Explain the importance of reproducers #9053 contents into that branch:
    $ git cherry-pick -x 5f5a4d2c320f071391a0c47ecedaf507bcb9a469
    If it'll yell at you with something like fatal: Commit 5f5a4d2c320f071391a0c47ecedaf507bcb9a469 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 5f5a4d2c320f071391a0c47ecedaf507bcb9a469
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Explain the importance of reproducers #9053 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.11/5f5a4d2c320f071391a0c47ecedaf507bcb9a469/pr-9053
  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.

@bdraco
Copy link
Member

bdraco commented Sep 7, 2024

Not sure if backport matters here as github only looks at master for the issue templates

@webknjaz
Copy link
Member

Not sure if backport matters here as github only looks at master for the issue templates

Yes. But it may cause problems when backporting other PRs with functional changes that happen to also touch these files for whatever reason…

@@ -35,6 +35,8 @@ body:
1. Implement the following server or a client '...'
2. Then run '...'
3. An error occurs.
The chances of someone looking at your issue are *vastly* improved if you provide
Copy link
Member

Choose a reason for hiding this comment

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

Personally, I'd put it into the description of the field rather than the placeholder that disappears as soon as somebody clicks on it... check the UX here https://github.com/aio-libs/aiohttp/issues/new?assignees=aio-libs%2Ftriagers&labels=bug&projects=&template=bug_report.yml

Copy link
Member Author

Choose a reason for hiding this comment

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

Feel free to adjust. I'm not sure how I'd format it into the description.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-3.10 Trigger automatic backporting to the 3.10 release branch by Patchback robot backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot bot:chronographer:skip This PR does not need to include a change note
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants