2
96%
master: 96%

Ran 15 Sep 2016 04:11PM UTC

Files 40

Run time 3s

Badge

Embed ▾

Committed 15 Sep 2016 04:07PM UTC coverage: 83.81% (+0.06%) from 83.747%

Job # CONDA_ENV=py27-cdat+pynio

Build Type

push

travis-ci

Committed by

shoyer

Commit Message

add 'no_conflicts' as compat option for merging non-conflicting data (#996)

* Add notnull_equals method to Variable

* add more tests for Variable.notnull_equals

* add DataArray.notnull_equals

* more tests for DataArray.notnull_equals

* add Dataset.notnull_equals

* remove redundant notnull_equivalent from utils

* fix introduced flake8 errors

* add 'notnull_equals' compat option to merge function and method

* add wrong shape test to Variable.notnull_equals

* refactor isnull

* remove Dataset/Array `notnull_equals` methods

* rename 'notnull_equals' --> 'no_conflicts'

* update merge docstrings to include 'no_conflicts'

* add docs on 'no_conflicts'

* whats new entry

* update dataset.merge docs

and fix Raises ValueError -> MergeError

* Update combining.rst
Update combining.rst

* DOC: We don't use None for missing values

Run Details

5011 of 5979 relevant lines covered (83.81%)

0.84 hits per line

pydata / xarray / 2379 / 2
96%
master: 96%

README BADGES
x

Markdown

Textile

RDoc

HTML

Rst

Source Files on job 2379.2 (CONDA_ENV=py27-cdat+pynio)

pydata / xarray / 2379 / 2 96% master: 96%

README BADGES x

Markdown

Textile

RDoc

HTML

Rst

Source Files on job 2379.2 (CONDA_ENV=py27-cdat+pynio)

pydata / xarray / 2379 / 2
96%
master: 96%

README BADGES
x