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

Revert time-machine back to freezegun #7937

Merged
merged 1 commit into from
Dec 3, 2023
Merged

Conversation

Dreamsorcerer
Copy link
Member

@Dreamsorcerer Dreamsorcerer commented Dec 3, 2023

time-machine has been causing issues and freezegun seems to have been picked up again.

Fixes #7851.

@Dreamsorcerer Dreamsorcerer added bot:chronographer:skip This PR does not need to include a change note backport-3.9 backport-3.10 Trigger automatic backporting to the 3.10 release branch by Patchback robot labels Dec 3, 2023
@Dreamsorcerer Dreamsorcerer enabled auto-merge (squash) December 3, 2023 23:00
Copy link

codecov bot commented Dec 3, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (da2e349) 97.43% compared to head (1eaf9b4) 97.43%.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #7937   +/-   ##
=======================================
  Coverage   97.43%   97.43%           
=======================================
  Files         107      107           
  Lines       32353    32346    -7     
  Branches     3751     3748    -3     
=======================================
- Hits        31522    31516    -6     
+ Misses        630      629    -1     
  Partials      201      201           
Flag Coverage Δ
CI-GHA 97.35% <100.00%> (+<0.01%) ⬆️
OS-Linux 97.02% <100.00%> (+<0.01%) ⬆️
OS-Windows 95.52% <100.00%> (+<0.01%) ⬆️
OS-macOS 96.84% <100.00%> (+0.01%) ⬆️
Py-3.10.11 95.44% <100.00%> (+<0.01%) ⬆️
Py-3.10.13 96.83% <100.00%> (+<0.01%) ⬆️
Py-3.11.6 96.56% <100.00%> (+0.03%) ⬆️
Py-3.12.0 96.63% <100.00%> (+<0.01%) ⬆️
Py-3.8.10 95.41% <100.00%> (+<0.01%) ⬆️
Py-3.8.18 96.76% <100.00%> (+<0.01%) ⬆️
Py-3.9.13 95.41% <100.00%> (+<0.01%) ⬆️
Py-3.9.18 96.80% <100.00%> (+<0.01%) ⬆️
Py-pypy7.3.13 96.34% <100.00%> (+0.09%) ⬆️
VM-macos 96.84% <100.00%> (+0.01%) ⬆️
VM-ubuntu 97.02% <100.00%> (+<0.01%) ⬆️
VM-windows 95.52% <100.00%> (+<0.01%) ⬆️

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.

@Dreamsorcerer Dreamsorcerer merged commit 43f92fa into master Dec 3, 2023
32 of 34 checks passed
@Dreamsorcerer Dreamsorcerer deleted the revert-time-machine branch December 3, 2023 23:26
Copy link
Contributor

patchback bot commented Dec 3, 2023

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

❌ Failed to cleanly apply 43f92fa on top of patchback/backports/3.9/43f92fae09bcc9692ee96ac1413eda884afa2f63/pr-7937

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

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

❌ Failed to cleanly apply 43f92fa on top of patchback/backports/3.10/43f92fae09bcc9692ee96ac1413eda884afa2f63/pr-7937

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

Dreamsorcerer added a commit that referenced this pull request Dec 4, 2023
Dreamsorcerer added a commit that referenced this pull request Dec 4, 2023
Dreamsorcerer added a commit that referenced this pull request Dec 4, 2023
Dreamsorcerer added a commit that referenced this pull request Dec 4, 2023
xiangxli pushed a commit to xiangxli/aiohttp that referenced this pull request Dec 4, 2023
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 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.9] test_max_age segfaults
1 participant