Add Moment.__sub__ and generalize Moment.__add__ #3216
Merged
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
- Also bump mypy version to fix an incompatibility with python 3.8
- Fix new mypy warnings:
- Add explicit !r to format statements touching bytes
- Rename `value_equality.py` to avoid name collision with the decorator it defines
- Ignore false positives related to abstract base type bounds
viathor
approved these changes
Aug 14, 2020
| @@ -509,7 +508,7 @@ def attempt_sync_with_master(pr: PullRequestDetails | |||
| data = { | |||
| 'base': pr.branch_name, | |||
| 'head': master_sha, | |||
| 'commit_message': 'Update branch (automerge)'.format(pr.branch_name) | |||
| 'commit_message': 'Update branch (automerge)' | |||
There was a problem hiding this comment.
The original looks like it was accidentally missing a {}. Suggestion:
'commit_message': 'Update branch {pr.branch_name} (automerge)'There was a problem hiding this comment.
No, it was intentional. When I changed it to not mention the branch name I just forgot to remove the format call.
| 'Code: {}. Content: {}.'.format(response.status_code, | ||
| response.content)) | ||
| 'Code: {}. Content: {!r}.'.format( | ||
| response.status_code, response.content)) |
There was a problem hiding this comment.
Use a format string?
(Applies throughout.)
There was a problem hiding this comment.
Acknowledged. Wanted to keep the refactoring minimal.
Strilanc
added
the
automerge
CirqBot
added
the
front_of_queue_automerge
CirqBot
removed
the
automerge
CirqBot
removed
the
front_of_queue_automerge
tonybruguier
pushed a commit
to tonybruguier/Cirq
that referenced
this pull request
Aug 23, 2020
- `Moment.__add__` now accepts any `OP_TREE`
- `Moment.__sub__` takes an `OP_TREE` and returns a moment with those operations removed
- If there is an operation-to-remove that was not present, an error is raised
- Also bump mypy version to fix an incompatibility with python 3.8 and fix new warnings
- Add explicit !r to format statements touching bytes
- Rename `value_equality.py` to avoid name collision with the decorator it defines
- Ignore false positives related to abstract base type bounds
Closed
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.
Moment.__add__now accepts anyOP_TREEMoment.__sub__takes anOP_TREEand returns a moment with those operations removedvalue_equality.pyto avoid name collision with the decorator it defines