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

Fix typing, use ClientTimeout instead of float, bump aiohttp dependency to 3.3.0+ #163

Merged
merged 4 commits into from
Aug 17, 2024

Conversation

felixfontein
Copy link
Collaborator

@felixfontein felixfontein commented Aug 5, 2024

I'm not sure whether there is an official deprecation, but the conversion code has been removed from master (aio-libs/aiohttp#6328) and there's now (since 3.10.0) typing that makes mypy no longer accept floats. The code in 3.10.0 still accepts them though, so this isn't a runtime issue yet.

Also aiohttp 3.3.0+ is required for the timeout parameter that has been used by the GET retry manager since the beginning, so I updated the dependency version range.

Also pyre doesn't think ClientSession.get exists anymore with 3.10.0 🙄

@felixfontein felixfontein added the backport-2 Automatically create backport to stable-2 branch label Aug 5, 2024
@felixfontein felixfontein changed the title Fix typing, use ClientTimeout instead of float Fix typing, use ClientTimeout instead of float, bump aiohttp dependency to 3.3.0+ Aug 5, 2024
@felixfontein
Copy link
Collaborator Author

antsibull compatibility fails because of pyre...

@felixfontein
Copy link
Collaborator Author

Ping @gotmax23

Copy link
Collaborator

@gotmax23 gotmax23 left a comment

Choose a reason for hiding this comment

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

I didn't dig through the aiohttp sources to verify the version constraints, but this looks good to me.

@felixfontein felixfontein merged commit 87e294e into ansible-community:main Aug 17, 2024
5 checks passed
Copy link

patchback bot commented Aug 17, 2024

Backport to stable-2: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 87e294e on top of patchback/backports/stable-2/87e294e058f9edbf9d9cebfb0da6ede34b275e46/pr-163

Backporting merged PR #163 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/ansible-community/antsibull-core.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/stable-2/87e294e058f9edbf9d9cebfb0da6ede34b275e46/pr-163 upstream/stable-2
  4. Now, cherry-pick PR Fix typing, use ClientTimeout instead of float, bump aiohttp dependency to 3.3.0+ #163 contents into that branch:
    $ git cherry-pick -x 87e294e058f9edbf9d9cebfb0da6ede34b275e46
    If it'll yell at you with something like fatal: Commit 87e294e058f9edbf9d9cebfb0da6ede34b275e46 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 87e294e058f9edbf9d9cebfb0da6ede34b275e46
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Fix typing, use ClientTimeout instead of float, bump aiohttp dependency to 3.3.0+ #163 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-2/87e294e058f9edbf9d9cebfb0da6ede34b275e46/pr-163
  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.

@felixfontein felixfontein deleted the timeout branch August 17, 2024 08:52
@felixfontein
Copy link
Collaborator Author

@gotmax23 thanks for reviewing this!

felixfontein added a commit to felixfontein/antsibull-core that referenced this pull request Aug 17, 2024
…cy to 3.3.0+ (ansible-community#163)

* Fix typing problems pyre has with aiohttp 3.10.1.

* Use ClientTimeout for timeout.

* Fix aiohttp dependency.

* Restrict aiohttp version for antsibull compatibility check to make pyre happy.

(cherry picked from commit 87e294e)
@felixfontein
Copy link
Collaborator Author

Backport to stable-2: #164.

felixfontein added a commit that referenced this pull request Aug 17, 2024
…cy to 3.3.0+ (#163) (#164)

* Fix typing problems pyre has with aiohttp 3.10.1.

* Use ClientTimeout for timeout.

* Fix aiohttp dependency.

* Restrict aiohttp version for antsibull compatibility check to make pyre happy.

(cherry picked from commit 87e294e)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-2 Automatically create backport to stable-2 branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants