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.

Sign up for GitHub

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

Jump to bottom

use the lock file for pinning dependencies, not the project definition #18305

Merged
merged 18 commits into from
Dec 2, 2024
Merged

use the lock file for pinning dependencies, not the project definition #18305

merged 18 commits into from
Dec 2, 2024

Conversation

altendky
Copy link
Contributor

@altendky altendky commented Jul 15, 2024 •
edited
Loading

Purpose:

Presently every dependabot PR that updates a package we have specified in pyproject.toml conflicts because the poetry.lock has a hash of the contents of pyproject.toml. There's various discussion that could be had around * vs. >=x.y.z vs. ^x.y and specifying versions here or there or wherever... but we can't be dealing with these conflicts every time so some option involving not changing pyproject.toml every time is needed.

With this change it is reasonable once again to have dependabot auto-rebase since the PRs won't all be conflicting.

Current Behavior:

New Behavior:

Testing Notes:

@altendky altendky added the Changed Required label for PR that categorizes merge commit message as "Changed" for changelog label Jul 15, 2024
@github-actions github-actions bot added the merge_conflict Branch has conflicts that prevent merge to main label Jul 15, 2024
@github-actions GitHub Actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the merge_conflict Branch has conflicts that prevent merge to main label Jul 26, 2024
@github-actions GitHub Actions
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@altendky altendky marked this pull request as ready for review July 26, 2024 17:30
@altendky altendky requested a review from a team as a code owner July 26, 2024 17:30
@github-actions GitHub Actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added the merge_conflict Branch has conflicts that prevent merge to main label Jul 29, 2024
@github-actions GitHub Actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the merge_conflict Branch has conflicts that prevent merge to main label Aug 12, 2024
@github-actions GitHub Actions
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@altendky altendky marked this pull request as draft August 14, 2024 14:12
@github-actions github-actions bot added the merge_conflict Branch has conflicts that prevent merge to main label Aug 15, 2024
@github-actions GitHub Actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions GitHub Actions
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@github-actions github-actions bot added merge_conflict Branch has conflicts that prevent merge to main and removed merge_conflict Branch has conflicts that prevent merge to main labels Sep 11, 2024
@github-actions GitHub Actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

1 similar comment
@github-actions GitHub Actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

arvidn
arvidn reviewed Sep 12, 2024
View reviewed changes
pyproject.toml Show resolved Hide resolved
@github-actions github-actions bot removed the merge_conflict Branch has conflicts that prevent merge to main label Sep 12, 2024
@github-actions GitHub Actions
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@github-actions GitHub Actions
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@github-actions github-actions bot removed the merge_conflict Branch has conflicts that prevent merge to main label Sep 27, 2024
@coveralls-official Coveralls Official
Copy link

Pull Request Test Coverage Report for Build 11072836265

Details

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • 37 unchanged lines in 7 files lost coverage.
  • Overall coverage remained the same at 90.958%
Files with Coverage Reduction New Missed Lines %
chia/data_layer/data_store.py 1 95.64%
chia/_tests/core/full_node/test_transactions.py 1 99.14%
chia/wallet/util/wallet_sync_utils.py 1 86.54%
chia/plotters/madmax.py 1 50.6%
chia/rpc/rpc_server.py 4 87.83%
chia/wallet/wallet_node.py 7 88.15%
chia/_tests/core/util/test_lockfile.py 22 77.73%
Totals Coverage Status
Change from base Build 11060322104: 0.0%
Covered Lines: 102031
Relevant Lines: 112151
💛 - Coveralls

@github-actions GitHub Actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added the merge_conflict Branch has conflicts that prevent merge to main label Sep 30, 2024
@github-actions GitHub Actions
Copy link
Contributor

This PR has been flagged as stale due to no activity for over 60 days. It will not be automatically closed, but it has been given a stale-pr label and should be manually reviewed by the relevant parties.

@github-actions github-actions bot added the stale-pr Flagged as stale and in need of manual review label Nov 15, 2024
@github-actions github-actions bot removed the merge_conflict Branch has conflicts that prevent merge to main label Nov 26, 2024
@github-actions GitHub Actions
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@altendky altendky marked this pull request as ready for review November 26, 2024 21:02
@altendky altendky requested a review from a team as a code owner November 26, 2024 21:02
@altendky altendky removed the stale-pr Flagged as stale and in need of manual review label Nov 26, 2024
@altendky altendky marked this pull request as draft November 26, 2024 21:25
@github-actions GitHub Actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added the merge_conflict Branch has conflicts that prevent merge to main label Nov 27, 2024
@github-actions github-actions bot removed the merge_conflict Branch has conflicts that prevent merge to main label Nov 27, 2024
@github-actions GitHub Actions
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@altendky altendky marked this pull request as ready for review November 27, 2024 20:01
@pmaslana pmaslana merged commit b93f300 into main Dec 2, 2024
363 checks passed
@pmaslana pmaslana deleted the pin_in_lock branch December 2, 2024 18:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@arvidn arvidn arvidn left review comments

@emlowe emlowe emlowe approved these changes

Assignees
No one assigned
Labels
Changed Required label for PR that categorizes merge commit message as "Changed" for changelog
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@altendky @arvidn @emlowe @pmaslana