Skip to content

Viridis latest #2105

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 76 commits into from
Sep 1, 2016
Merged

Viridis latest #2105

merged 76 commits into from
Sep 1, 2016

Conversation

doutriaux1
Copy link
Contributor

goes with CDAT/uvcdat-testdata#154

@aashish24 @danlipsa @chaosphere2112 please review passes all test on my mac and linux boxes

doutriaux1 added 30 commits July 8, 2016 13:14
@doutriaux1
need to pass -b to build cdat_info out of source
ba00406
@doutriaux1
Added cdat_info to list of pkg to build
1388419
@doutriaux1
works better with files...
be11857
@doutriaux1
Merge branch 'master' into issue_2047_cdat_info
28522e9
@doutriaux1
removed installation of gfortran from mac
c4ffb14 
gfortran now comes a spart of packaged uvcdat
fix hdf5 to 1.8.16
@doutriaux1
Merge remote-tracking branch 'origin/issue_2047_cdat_info' into fix_t…
82e87e2 
…ravis
@doutriaux1
trying to force the correct os
f8e52c4
@doutriaux1
enable using conda pkg vtk built against mesa
567c751
@doutriaux1
tell travis to build vs NOX if Linux
eba8c15
@doutriaux1
empty var env seemed to have confused the mac
59b7f9c
@doutriaux1
a few statements to know what's going on on travis and build
4c97abc
@doutriaux1
installing cmake via conda
97b3a51
@doutriaux1
merged master in
fa6e491
@doutriaux1
Merge branch 'master' into fix_travis
367ee30
@doutriaux1
Adding sudo false because we are old and we will not get container ba…
f796d73 
…sed build otherwise, removed sudo lines because we do not use gfortran in this travis build
@doutriaux1
vcs default colormap is no more 'default' but 'viridis'
4235f26
@doutriaux1
241 is now 'black'
e22726a
@doutriaux1
Merge remote-tracking branch 'origin/master' into viridis
5dbc4f4
@doutriaux1
turned off update baselines
8bcd329
@doutriaux1
@aashish24 new initial.attributes was busted for projections, fixing it
04e599c
@doutriaux1
Merge remote-tracking branch 'origin/master' into viridis_latest
c062a5a
@doutriaux1
removed nbegative x/y placements from templates
51bf165
@doutriaux1
removed >1. x/y placements from templates
14b7f9e
@doutriaux1
solving sewtting marker type for lines types
e16e66b
@doutriaux1
converted red marker to red color
3a538fc
@doutriaux1
missing 241 and 1 converted to rgb
98be156
@doutriaux1
most colors converted to rgb
a29b742
@doutriaux1
more colors converted to rgb
178a6ed
@doutriaux1
def cmap will come with viridis
b1588a8
@doutriaux1
closing in on pep8
f484957
@danlipsa
Copy link
Contributor

Do: test

@cdatrobot
Copy link

Your merge request has been queued for testing. You may view the test results on CDash or Buildbot.

Branch-at: c4ac10e

@danlipsa
Copy link
Contributor

@doutriaux1 Nice, only 3 failures: 2 stipple offset test failures and one font size and we are good.
https://open.cdash.org/index.php?compare1=63&filtercount=2&field1=buildname%2Fstring&project=UV-CDAT&field2=buildstarttime%2Fdate&showfilters=0&limit=100&compare2=83&value1=c4ac10eb&showfeed=0&value2=20160831T094724

@doutriaux1
Copy link
Contributor Author

@danlipsa do you mind adding these new baselines? I do not have access to karma

@danlipsa
Copy link
Contributor

@doutriaux1 You should see the same thing on your local linux machine. That is the idea at least. Let me know, if you don't, I can add the baselines - I'll just copy them from cdash.

@doutriaux1
Copy link
Contributor Author

a green Linux on travis! Yeah! https://travis-ci.org/UV-CDAT/uvcdat/jobs/156546414

@danlipsa
Copy link
Contributor

Do: test

@cdatrobot
Copy link

Your merge request has been queued for testing. You may view the test results on CDash or Buildbot.

Branch-at: ae16f88

@danlipsa
Copy link
Contributor

@doutriaux1 Green buildbot. 👍 Ready to merge.

@doutriaux1 doutriaux1 merged commit c812cee into master Sep 1, 2016
@doutriaux1 doutriaux1 deleted the viridis_latest branch September 1, 2016 15:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@doutriaux1 @chaosphere2112 @aashish24 @cdatrobot @danlipsa @sankhesh