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

FIX #526: Do not depend on test-sources #527

Merged
merged 0 commits into from Oct 11, 2016

Conversation

@ankostis
Copy link
Contributor

@ankostis ankostis commented Oct 11, 2016

  • Move HIDE_WINDOWS_KNOWN_ERRORS flag from
    git.test.lib.helper-->git.util;
    regular modules in main-sources folder also depend on that flag.
  • Use unittest.SkipTest instead of from non-standard nose lib.
@Byron Byron added the in progress label Oct 11, 2016
@ankostis
Copy link
Contributor Author

@ankostis ankostis commented Oct 11, 2016

It is strange...in my appveyor project, this PR pases OK: https://ci.appveyor.com/project/ankostis/gitpython/build/1.0.226

[edit] and it is a different commit, from a different branch! (master instead of nonose)

@ankostis ankostis force-pushed the ankostis:nonose branch from 74c7ed0 to 5751b97 Oct 11, 2016
@codecov-io
Copy link

@codecov-io codecov-io commented Oct 11, 2016

Current coverage is 93.66% (diff: 81.81%)

Merging #527 into master will increase coverage by 0.03%

@@             master       #527   diff @@
==========================================
  Files            63         63          
  Lines          9652       9651     -1   
  Methods           0          0          
  Messages          0          0          
  Branches          0          0          
==========================================
+ Hits           9038       9040     +2   
+ Misses          614        611     -3   
  Partials          0          0          

Powered by Codecov. Last update 9557508...aafde7d

@ankostis
Copy link
Contributor Author

@ankostis ankostis commented Oct 11, 2016

There is something fishy going on...I just amended and re-pushed the commit, and still in the Appveyor I'm getting a commit-id that I do not have it in my local repo: cc096ddf

Clicking on to it I see that it is a merge commi, only present on GitHub - but this PR is not yet merged, and actually it is explicitly not based on the latest master, to avoid errors from #513. But this "automatic merge" behavior is defeating my goal.

@ Byron any idea why this is happening?

@ankostis ankostis force-pushed the ankostis:nonose branch 2 times, most recently from aafde7d to 74c7ed0 Oct 11, 2016
@ankostis ankostis merged commit 74c7ed0 into gitpython-developers:master Oct 11, 2016
2 of 4 checks passed
2 of 4 checks passed
codecov/patch 81.81% of diff hit (target 93.63%)
Details
continuous-integration/appveyor/pr AppVeyor build failed
Details
codecov/project 93.66% (+0.03%) compared to 9557508
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@ankostis ankostis force-pushed the gitpython-developers:master branch from 9557508 to 4b84602 Oct 11, 2016
@Byron Byron removed the in progress label Oct 11, 2016
@ankostis ankostis deleted the ankostis:nonose branch Oct 11, 2016
@ankostis ankostis modified the milestone: v2.1.0 - proper windows support Oct 15, 2016
@Byron
Copy link
Member

@Byron Byron commented Oct 16, 2016

@ankostis I am looking into the appveyor settings right now - even though I didn't change them at all, maybe there is a checkbox to turn that behaviour off.

@ankostis
Copy link
Contributor Author

@ankostis ankostis commented Oct 16, 2016

I don't know either if this auto merge is configurable.
As long as there are no master failures, it won't be a problem B- so you can forget about it.

@Byron
Copy link
Member

@Byron Byron commented Oct 16, 2016

Alright - I also didn't find anything - apparently turning this behaviour off is not that easy.

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

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.