Add @ operator, no coersion #21
Closed
Conversation
This file contains hidden or 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
added 3 commits
May 9, 2017 12:30
# This is the 1st commit message: # This is a combination of 2 commits. # This is the 1st commit message: # This is a combination of 5 commits. # This is the 1st commit message: # This is a combination of 3 commits. # This is the 1st commit message: # This is a combination of 3 commits. # This is the 1st commit message: # This is a combination of 3 commits. # This is the 1st commit message: # This is a combination of 4 commits. # This is the 1st commit message: Add @ operator (__matmul__ and __rmatmul__) and tests. Do not implem ent coersion of Python lists/tuples. # This is the commit message pydata#2: test for __rmatmul__ # This is the commit message pydata#3: Better implementation of __rmatmul__ and test that exercises the actual code, not NumPy's # The commit message pydata#4 will be skipped: # Cleanup tests of coersion failure # The commit message pydata#2 will be skipped: # # This is a combination of 2 commits. # # This is the 1st commit message: # # Resolve merge conflict in rebasing # # # The commit message pydata#2 will be skipped: # # # test for __rmatmul__ # The commit message pydata#3 will be skipped: # Resolve merge conflict in rebasing # The commit message pydata#2 will be skipped: # test for __rmatmul__ # The commit message pydata#3 will be skipped: # Better implementation of __rmatmul__ and test that exercises the actual code, not NumPy's # This is the commit message pydata#2: Remove handling of lists etc. # The commit message pydata#3 will be skipped: # Remove handling of lists etc. # The commit message pydata#2 will be skipped: # # This is a combination of 3 commits. # # This is the 1st commit message: # # This is a combination of 2 commits. # # This is the 1st commit message: # # # This is a combination of 2 commits. # # This is the 1st commit message: # # Resolve merge on rebase # # # The commit message pydata#2 will be skipped: # # # Resolve merge on rebase # # # The commit message pydata#2 will be skipped: # # # Better implementation of __rmatmul__ and test that exercises the actual code, not NumPy's # # # The commit message pydata#2 will be skipped: # # # Remove handling of lists etc. # # # The commit message pydata#3 will be skipped: # # # Remove handling of lists etc. # The commit message pydata#3 will be skipped: # Resolve merge on rebase # The commit message pydata#4 will be skipped: # Resolve merge on rebase # The commit message pydata#5 will be skipped: # Resolve merge on rebase # The commit message pydata#2 will be skipped: # Better implementation of __rmatmul__ and test that exercises the actual code, not NumPy's # The commit message pydata#2 will be skipped: # Remove handling of lists etc. # The commit message pydata#3 will be skipped: # Remove handling of lists etc.
…atmul__) and tests. Do not implem ent coersion of Python lists/tuples.
|
Oh well... looks like @jakevdp merged the branch with the messier commit history while I was learning the maddening mysteries of I think if you apply this it will still clean the commit history (but should otherwise be identical code changes). But I am way less than confident in my understanding of git, so use your judgement. |
|
Oh, sorry about that. I did a squash and merge on the other one so it's just a single commit. FWIW, for doing this kind of cleaning of commit history, I tend to use |
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.
This replaces #16. I did not have the git-fu to prune the commit history under my fork's master. This has the same changes, but in a new branch that is rebased with cleaner commits.