PEP 694 (resolved merge conflicts from PR #8941) #16277
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Resolves all merge conflicts that have crept in from pypi#8941 since the last commit to that branch. This commit does *not* attempt to resolve any comments on the original PR, nor have I even run the tests on this branch yet. No promises that I haven't botched the merge conflict resolutions either.
`make lint` `make reformat`
|
* `is_(None)` -> `is None` * `isnot(None)` -> `is not None`
warsaw
changed the title
Use `Mapped` columns in the model. `make checkdb` still fails, but let's fix that next.
`docker compose run web python -m warehouse db revision --autogenerate --message "draft_releases"` then copying the upgrade() and downgrade() scripts from the old migration to the new one. I don't see much of a difference other than the revision, but it seems to make `make checkdb` happy.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves all merge conflicts that have crept in from #8941 since the last commit to that
branch.
This commit does not attempt to resolve any comments on the original PR, nor
have I even run the tests on this branch yet. No promises that I haven't
botched the merge conflict resolutions either.