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

Create hello.txt.gz dynamically and improve related assertions #8136

Merged
merged 8 commits into from
Feb 13, 2024

Conversation

steverep
Copy link
Member

@steverep steverep commented Feb 5, 2024

What do these changes do?

This is separate so it can be fully backported.

Are there changes in behavior for the user?

No

Is it a substantial burden for the maintainers to support this?

No

Related issue number

No

Checklist

  • I think the code is well written
  • Unit tests for the changes exist
  • Documentation reflects the changes
  • If you provide code modification, please add yourself to CONTRIBUTORS.txt
    • The format is <Name> <Surname>.
    • Please keep alphabetical order, the file is sorted by names.
  • Add a new news fragment into the CHANGES/ folder
    • name it <issue_or_pr_num>.<type>.rst (e.g. 588.bugfix.rst)

    • if you don't have an issue number, change it to the pull request
      number after creating the PR

      • .bugfix: A bug fix for something the maintainers deemed an
        improper undesired behavior that got corrected to match
        pre-agreed expectations.
      • .feature: A new behavior, public APIs. That sort of stuff.
      • .deprecation: A declaration of future API removals and breaking
        changes in behavior.
      • .breaking: When something public is removed in a breaking way.
        Could be deprecated in an earlier release.
      • .doc: Notable updates to the documentation structure or build
        process.
      • .packaging: Notes for downstreams about unobvious side effects
        and tooling. Changes in the test invocation considerations and
        runtime assumptions.
      • .contrib: Stuff that affects the contributor experience. e.g.
        Running tests, building the docs, setting up the development
        environment.
      • .misc: Changes that are hard to assign to any of the above
        categories.
    • Make sure to use full sentences with correct case and punctuation,
      for example:

      Fixed issue with non-ascii contents in doctest text files
      -- by :user:`contributor-gh-handle`.

      Use the past tense or the present tense a non-imperative mood,
      referring to what's changed compared to the last released version
      of this project.

@psf-chronographer psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Feb 5, 2024
@steverep
Copy link
Member Author

steverep commented Feb 5, 2024

What's with the random seg faults on PyPy?

@Dreamsorcerer
Copy link
Member

Dreamsorcerer commented Feb 5, 2024

What's with the random seg faults on PyPy?

No idea, been doing it for about 3 months now and bumping to a newer version didn't help either...

CHANGES/8136.misc.rst Outdated Show resolved Hide resolved
CHANGES/8136.misc.rst Outdated Show resolved Hide resolved
Co-authored-by: Sviatoslav Sydorenko (Святослав Сидоренко) <[email protected]>
Copy link

codecov bot commented Feb 6, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (8b33fe6) 97.41% compared to head (03a043c) 97.51%.
Report is 13 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #8136      +/-   ##
==========================================
+ Coverage   97.41%   97.51%   +0.10%     
==========================================
  Files         107      107              
  Lines       32732    32734       +2     
  Branches     3823     3827       +4     
==========================================
+ Hits        31885    31921      +36     
+ Misses        640      612      -28     
+ Partials      207      201       -6     
Flag Coverage Δ
CI-GHA 97.43% <100.00%> (+0.10%) ⬆️
OS-Linux 97.10% <100.00%> (+0.10%) ⬆️
OS-Windows 95.61% <100.00%> (+0.10%) ⬆️
OS-macOS 96.92% <100.00%> (+0.09%) ⬆️
Py-3.10.11 95.54% <100.00%> (+0.10%) ⬆️
Py-3.10.13 96.91% <100.00%> (+0.09%) ⬆️
Py-3.11.7 96.58% <100.00%> (+0.09%) ⬆️
Py-3.12.1 96.68% <100.00%> (+0.06%) ⬆️
Py-3.8.10 95.50% <100.00%> (+0.10%) ⬆️
Py-3.8.18 96.84% <100.00%> (+0.10%) ⬆️
Py-3.9.13 95.50% <100.00%> (+0.10%) ⬆️
Py-3.9.18 96.87% <100.00%> (+0.09%) ⬆️
Py-pypy7.3.15 96.42% <100.00%> (+0.09%) ⬆️
VM-macos 96.92% <100.00%> (+0.09%) ⬆️
VM-ubuntu 97.10% <100.00%> (+0.10%) ⬆️
VM-windows 95.61% <100.00%> (+0.10%) ⬆️

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.

CHANGES/8136.contrib.rst Outdated Show resolved Hide resolved
Co-authored-by: Sviatoslav Sydorenko (Святослав Сидоренко) <[email protected]>
Copy link
Member

@webknjaz webknjaz left a comment

Choose a reason for hiding this comment

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

I think, this patch is good, and addressing the weird assert await places and other comments is optional. I'll let somebody else merge, though, in case there's extra opinions.

@bdraco
Copy link
Member

bdraco commented Feb 13, 2024

Tagging for backport since we want to pull the other PR on top of this and it will conflict otherwise

@bdraco
Copy link
Member

bdraco commented Feb 13, 2024

I think this looks good. Some trivial nits in the docstrings above, but otherwise looks good to merge from my perspective.

@bdraco bdraco merged commit 026e8d9 into aio-libs:master Feb 13, 2024
30 of 33 checks passed
Copy link
Contributor

patchback bot commented Feb 13, 2024

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

❌ Failed to cleanly apply 026e8d9 on top of patchback/backports/3.9/026e8d9872ab4511c38578a8c784cd2e740f0448/pr-8136

Backporting merged PR #8136 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/026e8d9872ab4511c38578a8c784cd2e740f0448/pr-8136 upstream/3.9
  4. Now, cherry-pick PR Create hello.txt.gz dynamically and improve related assertions #8136 contents into that branch:
    $ git cherry-pick -x 026e8d9872ab4511c38578a8c784cd2e740f0448
    If it'll yell at you with something like fatal: Commit 026e8d9872ab4511c38578a8c784cd2e740f0448 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 026e8d9872ab4511c38578a8c784cd2e740f0448
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Create hello.txt.gz dynamically and improve related assertions #8136 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.9/026e8d9872ab4511c38578a8c784cd2e740f0448/pr-8136
  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 Feb 13, 2024

Thanks @steverep

Copy link
Contributor

patchback bot commented Feb 13, 2024

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

❌ Failed to cleanly apply 026e8d9 on top of patchback/backports/3.10/026e8d9872ab4511c38578a8c784cd2e740f0448/pr-8136

Backporting merged PR #8136 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/026e8d9872ab4511c38578a8c784cd2e740f0448/pr-8136 upstream/3.10
  4. Now, cherry-pick PR Create hello.txt.gz dynamically and improve related assertions #8136 contents into that branch:
    $ git cherry-pick -x 026e8d9872ab4511c38578a8c784cd2e740f0448
    If it'll yell at you with something like fatal: Commit 026e8d9872ab4511c38578a8c784cd2e740f0448 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 026e8d9872ab4511c38578a8c784cd2e740f0448
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Create hello.txt.gz dynamically and improve related assertions #8136 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.10/026e8d9872ab4511c38578a8c784cd2e740f0448/pr-8136
  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 Feb 13, 2024

Looks like this one will need some manual backports. I was hoping it was going to merge back cleanly.

@steverep
Copy link
Member Author

Looks like this one will need some manual backports. I was hoping it was going to merge back cleanly.

I don't see anything that would actually conflict so it's probably trivial. I'll take care of it.

@steverep steverep deleted the remove-hello-gzip branch February 13, 2024 20:27
steverep added a commit to steverep/aiohttp that referenced this pull request Feb 13, 2024
…aio-libs#8136)

(cherry picked from commit 026e8d9)

Co-authored-by: Steve Repsher <[email protected]>
Co-authored-by: Sviatoslav Sydorenko (Святослав Сидоренко) <[email protected]>
Co-authored-by: J. Nick Koston <[email protected]>
steverep added a commit to steverep/aiohttp that referenced this pull request Feb 13, 2024
…io-libs#8136)

(cherry picked from commit 026e8d9)

Co-authored-by: Steve Repsher <[email protected]>
Co-authored-by: Sviatoslav Sydorenko (Святослав Сидоренко) <[email protected]>
Co-authored-by: J. Nick Koston <[email protected]>
@steverep
Copy link
Member Author

I don't see anything that would actually conflict so it's probably trivial. I'll take care of it.

Done. Conflict was just any type was added to a couple of the functions' parameters.

bdraco added a commit that referenced this pull request Feb 14, 2024
…#8136) (#8156)

Co-authored-by: Sviatoslav Sydorenko (Святослав Сидоренко) <[email protected]>
Co-authored-by: J. Nick Koston <[email protected]>
bdraco added a commit that referenced this pull request Feb 14, 2024
…8136) (#8157)

Co-authored-by: Sviatoslav Sydorenko (Святослав Сидоренко) <[email protected]>
Co-authored-by: J. Nick Koston <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bot:chronographer:provided There is a change note present in this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants