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

Replace models.py hash check with a full-content check #2131

Closed
jsangmeister opened this issue Jan 19, 2024 · 0 comments · Fixed by #2132
Closed

Replace models.py hash check with a full-content check #2131

jsangmeister opened this issue Jan 19, 2024 · 0 comments · Fixed by #2132
Assignees
Labels
enhancement General enhancement which is neither bug nor feature
Milestone

Comments

@jsangmeister
Copy link
Contributor

While the hash check is faster, it leads to many unnecessary merge conflicts every time the models file gets updated in two different branches (e.g. main and some feature branch). This makes rebasing unnecessarily tedious. Instead, we should generate the models.py content in-memory during the check, run it through black and compare the literal contents for equality.

@jsangmeister jsangmeister added the enhancement General enhancement which is neither bug nor feature label Jan 19, 2024
@jsangmeister jsangmeister added this to the 4.2 milestone Jan 19, 2024
@jsangmeister jsangmeister self-assigned this Jan 19, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement General enhancement which is neither bug nor feature
Projects
None yet
Development

Successfully merging a pull request may close this issue.

1 participant