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

load texttables and textorientations and text markers first #1658

Merged
merged 21 commits into from Nov 16, 2015

Conversation

Projects
None yet
4 participants
@doutriaux1
Member

doutriaux1 commented Nov 3, 2015

some gm and templates use these

@aashish24 @chaosphere2112 @sankhesh should be a quick review

Review on Reviewable

@durack1

This comment has been minimized.

Member

durack1 commented Nov 3, 2015

@doutriaux1 looks like cont-int/LLNL/Darwin-Mac 10.10.5 (LEAN) is DEAD.. Wanna reboot/refresh?

@doutriaux1 doutriaux1 force-pushed the load_vcs_dependencies_right_order_from_json branch from 01a1bdd to 2a38096 Nov 5, 2015

@aashish24

This comment has been minimized.

Contributor

aashish24 commented Nov 6, 2015

@doutriaux1 you said quick review...I see lot of changes?

@doutriaux1

This comment has been minimized.

Member

doutriaux1 commented Nov 6, 2015

yes that was before I went crazy 😉 I still need to push fix for one test I think

@doutriaux1

This comment has been minimized.

Member

doutriaux1 commented Nov 9, 2015

@doutriaux1 doutriaux1 referenced this pull request Nov 9, 2015

Merged

better baseline #78

@doutriaux1

This comment has been minimized.

Member

doutriaux1 commented Nov 9, 2015

@aashish24 seems like all tests are passing now. Ready for review.

@aashish24

This comment has been minimized.

Contributor

aashish24 commented Nov 9, 2015

Will do today..thanks :)

@aashish24

This comment has been minimized.

Contributor

aashish24 commented Nov 16, 2015

LGTM 👍

aashish24 added a commit that referenced this pull request Nov 16, 2015

Merge pull request #1658 from UV-CDAT/load_vcs_dependencies_right_ord…
…er_from_json

load texttables and textorientations and text markers first

@aashish24 aashish24 merged commit bfa7129 into master Nov 16, 2015

8 of 9 checks passed

continuous-integration/kitware-buildbot/uvcdat-garant-linux-release/ Build done.
Details
cont-int/LLNL/Darwin-Mac 10.10.5 (LEAN) running 'ctest -j4 -D Experimental' (Mon Nov 9 10:10:53 2015)
Details
cont-int/LLNL/Darwin-Mac1 10.10.5 (NOGUI) running 'ctest -j4 -D Experimental' (Mon Nov 9 11:00:59 2015)
Details
cont-int/LLNL/Darwin-Mac2 10.10.5 (FULL) running 'ctest -j4 -D Experimental' (Mon Nov 9 13:16:14 2015)
Details
cont-int/LLNL/Linux-annie Ubuntu 15.04 (FULL/MESA) running 'ctest -j15 -D Experimental' (Mon Nov 9 10:54:38 2015)
Details
cont-int/LLNL/Linux-crunchy RH6 (FULL) running 'ctest -j12 -D Experimental' (Mon Nov 9 10:20:23 2015)
Details
cont-int/LLNL/Linux-oceanonly RH6 (MESA/NOGUI) running 'ctest -j12 -D Experimental' (Mon Nov 9 10:16:44 2015)
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details

@aashish24 aashish24 deleted the load_vcs_dependencies_right_order_from_json branch Nov 16, 2015

@chaosphere2112

This comment has been minimized.

Contributor

chaosphere2112 commented Nov 17, 2015

@doutriaux1 @durack1 Uh, this seems to have slipped in ipython 4.0, which has a busted build.

@durack1

This comment has been minimized.

Member

durack1 commented Nov 17, 2015

@chaosphere2112 that's weird, @doutriaux1 reverted the ipython4 PR..

@durack1

This comment has been minimized.

Member

durack1 commented Nov 17, 2015

@chaosphere2112 the PR on hold for 3.0 #1675 has a very simple test that should catch these problems..

@chaosphere2112

This comment has been minimized.

Contributor

chaosphere2112 commented Nov 17, 2015

@durack1 yeah, but it looks like @doutriaux1 accidentally merged #1675 into this branch (if you look above, there's 683596c in this PR. Just found out when I did a full build from source and typed "ipython" and it choked and died.

@durack1

This comment has been minimized.

Member

durack1 commented Nov 17, 2015

@chaosphere2112 looks like that's not the only one either.. 683596c, 753bdb7, 57c8ae3, 93fd367, 559f623..

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment