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

👷 Divide pip constraints into distinct pairs #7460

Merged
merged 1 commit into from
Aug 2, 2023

Conversation

webknjaz
Copy link
Member

@webknjaz webknjaz commented Aug 1, 2023

The in+txt key pairs can be managed by pip-tools and upgraded by Dependabot natively.

@webknjaz webknjaz self-assigned this Aug 1, 2023
@webknjaz webknjaz requested a review from asvetlov as a code owner August 1, 2023 23:33
@webknjaz webknjaz added infra meta dependencies Pull requests that update a dependency file bot:chronographer:skip This PR does not need to include a change note backport-3.8 labels Aug 1, 2023
@codecov
Copy link

codecov bot commented Aug 1, 2023

Codecov Report

Merging #7460 (23898d9) into master (36bc687) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master    #7460   +/-   ##
=======================================
  Coverage   97.27%   97.27%           
=======================================
  Files         106      106           
  Lines       31441    31441           
  Branches     3565     3565           
=======================================
  Hits        30585    30585           
  Misses        652      652           
  Partials      204      204           
Flag Coverage Δ
CI-GHA 97.22% <ø> (ø)
OS-Linux 96.90% <ø> (+<0.01%) ⬆️
OS-Windows 95.34% <ø> (ø)
OS-macOS 96.57% <ø> (ø)
Py-3.10.11 95.27% <ø> (ø)
Py-3.10.12 96.78% <ø> (ø)
Py-3.11.4 96.51% <ø> (ø)
Py-3.8.10 95.24% <ø> (ø)
Py-3.8.17 96.71% <ø> (ø)
Py-3.9.13 95.23% <ø> (ø)
Py-3.9.17 96.74% <ø> (ø)
Py-pypy7.3.11 96.32% <ø> (+<0.01%) ⬆️
VM-macos 96.57% <ø> (ø)
VM-ubuntu 96.90% <ø> (+<0.01%) ⬆️
VM-windows 95.34% <ø> (ø)

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

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@webknjaz webknjaz force-pushed the maintenance/pip-tools-pairs branch from b1a998c to 2ee8b08 Compare August 1, 2023 23:54
@webknjaz webknjaz requested review from Dreamsorcerer and removed request for asvetlov August 1, 2023 23:54
@webknjaz
Copy link
Member Author

webknjaz commented Aug 1, 2023

@Dreamsorcerer this is what I meant by revamping the lockfiles layout. Though, I believe further improvements can be made in follow-ups.

@webknjaz webknjaz force-pushed the maintenance/pip-tools-pairs branch 4 times, most recently from 34a0dbb to 3b95839 Compare August 2, 2023 00:42
The in+txt key pairs can be managed by pip-tools and upgraded by
Dependabot natively.
@webknjaz webknjaz force-pushed the maintenance/pip-tools-pairs branch from 3b95839 to 23898d9 Compare August 2, 2023 01:09
@webknjaz webknjaz merged commit 4b59d55 into aio-libs:master Aug 2, 2023
30 of 35 checks passed
@patchback

This comment was marked as outdated.

@patchback

This comment was marked as resolved.

# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# pip-compile --allow-unsafe --output-file=requirements/base.txt --strip-extras requirements/multidict.txt
Copy link
Member Author

Choose a reason for hiding this comment

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

Looks like I messed up arguments of the for-loop I used locally. Will have to hotfix the lock files in a follow-up PR.

webknjaz added a commit to webknjaz/aiohttp that referenced this pull request Aug 2, 2023
(cherry picked from commit 4b59d55)
webknjaz added a commit to webknjaz/aiohttp that referenced this pull request Aug 2, 2023
This patch hotfixes PR aio-libs#7460 which mistakenly sourced incoming
dependencies from the same file instead of using proper file pairs.
Comment on lines +1 to +2
Pillow < 10 # https://github.com/blockdiag/sphinxcontrib-blockdiag/issues/26
pydantic < 2 # looks like `python-on-whales` hasn't upgraded to support v2
Copy link
Member

Choose a reason for hiding this comment

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

Do we want to track these? Normally easier to just have the locks at working versions and let Dependabot PRs figure out when they are passing and can be bumped.

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes, otherwise pip-tools will try to upgrade to non-working versions. And dependabot would also spam with PRs likely.

FWIW, we may want to reconsider after getting the hotfixes and backports for this in.

Copy link
Member

Choose a reason for hiding this comment

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

If it's PRs to bump pillow and pydantic, that'd be the expected behaviour to me. Once they start working, the PRs will get merged, and I can check open PRs to see which are still failing at any given time.

@Dreamsorcerer
Copy link
Member

Looks like it's working! PRs to master are being automatically merged again.

webknjaz added a commit to webknjaz/aiohttp that referenced this pull request Aug 2, 2023
(cherry picked from commit 4b59d55)
webknjaz added a commit to webknjaz/aiohttp that referenced this pull request Aug 2, 2023
(cherry picked from commit 4b59d55)
@webknjaz
Copy link
Member Author

webknjaz commented Aug 2, 2023

With #7469 this should now be better. @Dreamsorcerer I'll probably mass-close dependabot PRs and wait for it to start making new ones...

@webknjaz
Copy link
Member Author

webknjaz commented Aug 2, 2023

Backport to 3.9: #7470

webknjaz added a commit that referenced this pull request Aug 2, 2023
webknjaz added a commit to webknjaz/aiohttp that referenced this pull request Aug 2, 2023
(cherry picked from commit 4b59d55)
(cherry picked from commit 7a6b0d7)
@webknjaz
Copy link
Member Author

webknjaz commented Aug 2, 2023

Backport to 3.8: #7471

webknjaz added a commit to webknjaz/aiohttp that referenced this pull request Aug 2, 2023
(cherry picked from commit 4b59d55)
(cherry picked from commit 7a6b0d7)
webknjaz added a commit to webknjaz/aiohttp that referenced this pull request Aug 3, 2023
(cherry picked from commit 4b59d55)
(cherry picked from commit 7a6b0d7)
webknjaz added a commit to webknjaz/aiohttp that referenced this pull request Aug 3, 2023
(cherry picked from commit 4b59d55)
(cherry picked from commit 7a6b0d7)
webknjaz added a commit to webknjaz/aiohttp that referenced this pull request Aug 3, 2023
(cherry picked from commit 4b59d55)
(cherry picked from commit 7a6b0d7)
webknjaz added a commit to webknjaz/aiohttp that referenced this pull request Aug 3, 2023
(cherry picked from commit 4b59d55)
(cherry picked from commit 7a6b0d7)
webknjaz added a commit to webknjaz/aiohttp that referenced this pull request Aug 3, 2023
(cherry picked from commit 4b59d55)
(cherry picked from commit 7a6b0d7)
webknjaz added a commit to webknjaz/aiohttp that referenced this pull request Aug 3, 2023
(cherry picked from commit 4b59d55)
(cherry picked from commit 7a6b0d7)
webknjaz added a commit to webknjaz/aiohttp that referenced this pull request Aug 3, 2023
(cherry picked from commit 4b59d55)
(cherry picked from commit 7a6b0d7)
webknjaz added a commit to webknjaz/aiohttp that referenced this pull request Aug 3, 2023
(cherry picked from commit 4b59d55)
(cherry picked from commit 7a6b0d7)
webknjaz added a commit to webknjaz/aiohttp that referenced this pull request Aug 3, 2023
(cherry picked from commit 4b59d55)
(cherry picked from commit 7a6b0d7)
webknjaz added a commit to webknjaz/aiohttp that referenced this pull request Aug 3, 2023
(cherry picked from commit 4b59d55)
(cherry picked from commit 7a6b0d7)
webknjaz added a commit to webknjaz/aiohttp that referenced this pull request Aug 3, 2023
(cherry picked from commit 4b59d55)
(cherry picked from commit 7a6b0d7)
webknjaz added a commit to webknjaz/aiohttp that referenced this pull request Aug 3, 2023
(cherry picked from commit 4b59d55)
(cherry picked from commit 7a6b0d7)
webknjaz added a commit to webknjaz/aiohttp that referenced this pull request Aug 3, 2023
(cherry picked from commit 4b59d55)
(cherry picked from commit 7a6b0d7)
webknjaz added a commit to webknjaz/aiohttp that referenced this pull request Aug 3, 2023
(cherry picked from commit 4b59d55)
(cherry picked from commit 7a6b0d7)
webknjaz added a commit to webknjaz/aiohttp that referenced this pull request Aug 3, 2023
(cherry picked from commit 4b59d55)
(cherry picked from commit 7a6b0d7)
webknjaz added a commit to webknjaz/aiohttp that referenced this pull request Aug 3, 2023
(cherry picked from commit 4b59d55)
(cherry picked from commit 7a6b0d7)
webknjaz added a commit to webknjaz/aiohttp that referenced this pull request Aug 3, 2023
(cherry picked from commit 4b59d55)
(cherry picked from commit 7a6b0d7)
webknjaz added a commit to webknjaz/aiohttp that referenced this pull request Aug 3, 2023
(cherry picked from commit 4b59d55)
(cherry picked from commit 7a6b0d7)
webknjaz added a commit to webknjaz/aiohttp that referenced this pull request Aug 3, 2023
(cherry picked from commit 4b59d55)
(cherry picked from commit 7a6b0d7)
webknjaz added a commit to webknjaz/aiohttp that referenced this pull request Aug 3, 2023
(cherry picked from commit 4b59d55)
(cherry picked from commit 7a6b0d7)
@webknjaz
Copy link
Member Author

webknjaz commented Aug 3, 2023

Backport to 3.8: #7471

@Dreamsorcerer I decided not to proceed with this as it's getting complicated on that branch and to get it working, further per-python constraints would need to be implemented which is a separate improvement by itself.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bot:chronographer:skip This PR does not need to include a change note dependencies Pull requests that update a dependency file infra meta
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants