Skip to content

Conversation

bowlofeggs
Copy link

doc_check and coverage checking are new in Pulp's master branch, but we want 1.0.0 of the
plugins to work against Pulp 2.5 ideally, or at least 2.6.0. This commit removes the doc_check
and coverage check from run-tests.

Also, 2.5 did not list its dependencies in its setup.py, so this adds them to the .travis.yml
file.

This change must not be propagated to master.

doc_check and coverage checking are new in Pulp's master branch, but we want 1.0.0 of the
plugins to work against Pulp 2.5 ideally, or at least 2.6.0. This commit removes the doc_check
and coverage check from run-tests.

Also, 2.5 did not list its dependencies in its setup.py, so this adds them to the .travis.yml
file.

This change must not be propagated to master.
@coveralls
Copy link

Coverage Status

Coverage remained the same at 100.0% when pulling 9d37047 on rbarlow:remove_doc_check into 637b336 on pulp:1.0-dev.

@beav
Copy link
Contributor

beav commented Mar 23, 2015

LGTM

@beav beav self-assigned this Mar 23, 2015
@beav beav added the LGTM label Mar 23, 2015
@bowlofeggs bowlofeggs merged commit 9d37047 into pulp:1.0-dev Mar 23, 2015
@bowlofeggs
Copy link
Author

I just confirmed that this was merged to master with the ours strategy, as it should have been. I believe this will allow the 1.0-* branches to have this fix (which is necessary), but also that merging forward will not introduce this change to master (which is undesirable). Thanks for the review!

@bowlofeggs bowlofeggs deleted the remove_doc_check branch March 23, 2015 23:48
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