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

prettydiff fallback #41

Merged
merged 2 commits into from
Apr 21, 2016
Merged

Conversation

bollwyvl
Copy link

Congrats on inclusion in jupyter! 🍰

On a vanilla Windows install, diff is not available, so test_present_string_diff will always fail.

This adds a fallback based on stdlib difflib.unified_diff, and accepts either unified or diff-default.

Another approach would be to always use diff -u (and keep the fallback) but just always assume unified diff.

@codecov-io
Copy link

Current coverage is 77.49%

Merging #41 into master will decrease coverage by -0.04% as of 447e16f

@@            master     #41   diff @@
======================================
  Files           25      25       
  Stmts         1540    1546     +6
  Branches         0       0       
  Methods          0       0       
======================================
+ Hit           1194    1198     +4
  Partial          0       0       
- Missed         346     348     +2

Review entire Coverage Diff as of 447e16f

Powered by Codecov. Updated on successful CI builds.

@minrk minrk merged commit cc31347 into jupyter:master Apr 21, 2016
@bollwyvl
Copy link
Author

Huzzah!

On Thu, Apr 21, 2016 at 8:34 AM Min RK [email protected] wrote:

Merged #41 #41.


You are receiving this because you authored the thread.
Reply to this email directly or view it on GitHub
#41 (comment)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants