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.

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

Refactor concat to use merge for non-concatenated variables #3239

Merged
merged 38 commits into from
Sep 16, 2019
Merged

Refactor concat to use merge for non-concatenated variables #3239

merged 38 commits into from
Sep 16, 2019

Commits on Aug 29, 2019

  1. Add compat = 'override' and data_vars/coords='sensible'

    @dcherian
    dcherian committed Aug 29, 2019
    Configuration menu
    Copy the full SHA
    09292b0 View commit details
    Browse the repository at this point in the history

  2. concat tests.

    @dcherian
    dcherian committed Aug 29, 2019
    Configuration menu
    Copy the full SHA
    69feaaa View commit details
    Browse the repository at this point in the history

  3. Update docstring.

    @dcherian
    dcherian committed Aug 29, 2019
    Configuration menu
    Copy the full SHA
    0bf8597 View commit details
    Browse the repository at this point in the history

  4. Begin merge, combine.

    @dcherian
    dcherian committed Aug 29, 2019
    Configuration menu
    Copy the full SHA
    4c994e2 View commit details
    Browse the repository at this point in the history

  5. Merge non concatenated variables.

    @dcherian
    dcherian committed Aug 29, 2019
    Configuration menu
    Copy the full SHA
    4cb7d02 View commit details
    Browse the repository at this point in the history

  6. Fix tests.

    @dcherian
    dcherian committed Aug 29, 2019
    Configuration menu
    Copy the full SHA
    9dc340e View commit details
    Browse the repository at this point in the history

  7. Fix tests 2

    @dcherian
    dcherian committed Aug 29, 2019
    Configuration menu
    Copy the full SHA
    dd24b00 View commit details
    Browse the repository at this point in the history

  8. Fix test 3

    @dcherian
    dcherian committed Aug 29, 2019
    Configuration menu
    Copy the full SHA
    09746d9 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2019

  1. Cleanup: reduce number of times we loop over datasets.

    @dcherian
    dcherian committed Aug 30, 2019
    Configuration menu
    Copy the full SHA
    b090e82 View commit details
    Browse the repository at this point in the history

  2. unique_variable does minimum number of loads: fixes dask test

    @dcherian
    dcherian committed Aug 30, 2019
    Configuration menu
    Copy the full SHA
    4ba681b View commit details
    Browse the repository at this point in the history

  3. docstrings for compat='override'

    @dcherian
    dcherian committed Aug 30, 2019
    Configuration menu
    Copy the full SHA
    75bd59b View commit details
    Browse the repository at this point in the history

  4. concat compat docstring.

    @dcherian
    dcherian committed Aug 30, 2019
    Configuration menu
    Copy the full SHA
    79ee32d View commit details
    Browse the repository at this point in the history

  5. remove the sensible option.

    @dcherian
    dcherian committed Aug 30, 2019
    Configuration menu
    Copy the full SHA
    e7b152c View commit details
    Browse the repository at this point in the history

  6. reduce silly changes.

    @dcherian
    dcherian committed Aug 30, 2019
    Configuration menu
    Copy the full SHA
    c114143 View commit details
    Browse the repository at this point in the history

  7. fix groupby order test.

    @dcherian
    dcherian committed Aug 30, 2019
    Configuration menu
    Copy the full SHA
    9f849d2 View commit details
    Browse the repository at this point in the history

  8. cleanup: var names + remove one loop through datasets.

    @dcherian
    dcherian committed Aug 30, 2019
    Configuration menu
    Copy the full SHA
    40707ca View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2019

  1. fix warning.

    @dcherian
    dcherian committed Sep 3, 2019
    Configuration menu
    Copy the full SHA
    633efe9 View commit details
    Browse the repository at this point in the history

  2. Add whats-new entry.

    @dcherian
    dcherian committed Sep 3, 2019
    Configuration menu
    Copy the full SHA
    6a6daab View commit details
    Browse the repository at this point in the history

  3. Add note in io.rst

    @dcherian
    dcherian committed Sep 3, 2019
    Configuration menu
    Copy the full SHA
    eb154f5 View commit details
    Browse the repository at this point in the history

  4. Update netcdf multi-file dataset section in io.rst.

    @dcherian
    dcherian committed Sep 3, 2019
    Configuration menu
    Copy the full SHA
    2a1ff5d View commit details
    Browse the repository at this point in the history

  5. Update mfdataset in dask.rst.

    @dcherian
    dcherian committed Sep 3, 2019
    Configuration menu
    Copy the full SHA
    2ad6608 View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2019

  1. simplify parse_datasets.

    @dcherian
    dcherian committed Sep 6, 2019
    Configuration menu
    Copy the full SHA
    3154b06 View commit details
    Browse the repository at this point in the history

  2. Avoid using merge_variables. unique_variable instead.

    @dcherian
    dcherian committed Sep 6, 2019
    Configuration menu
    Copy the full SHA
    02e35e6 View commit details
    Browse the repository at this point in the history

  3. small stuff.

    @dcherian
    dcherian committed Sep 6, 2019
    Configuration menu
    Copy the full SHA
    d7988c9 View commit details
    Browse the repository at this point in the history

  4. Update docs.

    @dcherian
    dcherian committed Sep 6, 2019
    Configuration menu
    Copy the full SHA
    628974e View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2019

  1. minor fix.

    @dcherian
    dcherian committed Sep 7, 2019
    Configuration menu
    Copy the full SHA
    73a203b View commit details
    Browse the repository at this point in the history

  2. minor fix.

    @dcherian
    dcherian committed Sep 7, 2019
    Configuration menu
    Copy the full SHA
    6b40c1f View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2019

  1. Merge branch 'master' into compat-override

    @dcherian
    dcherian authored Sep 10, 2019
    Configuration menu
    Copy the full SHA
    d849a0f View commit details
    Browse the repository at this point in the history

  2. lint.

    @dcherian
    dcherian committed Sep 10, 2019
    Configuration menu
    Copy the full SHA
    e4c12e8 View commit details
    Browse the repository at this point in the history

  3. Better error message.

    @dcherian
    dcherian committed Sep 10, 2019
    Configuration menu
    Copy the full SHA
    935089a View commit details
    Browse the repository at this point in the history

  4. rename to shorter variable names.

    @dcherian
    dcherian committed Sep 10, 2019
    Configuration menu
    Copy the full SHA
    c13dcff View commit details
    Browse the repository at this point in the history

  5. Cleanup: fillna preserves attrs now.

    @dcherian
    dcherian committed Sep 10, 2019
    Configuration menu
    Copy the full SHA
    6e4727a View commit details
    Browse the repository at this point in the history

  6. Look for concat dim in data_vars also.

    @dcherian
    dcherian committed Sep 10, 2019
    Configuration menu
    Copy the full SHA
    71ec88d View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2019

  1. Merge remote-tracking branch 'upstream/master' into compat-override 

    * upstream/master:
  ignore h5py 2.10.0 warnings and fix invalid_netcdf warning test. (pydata#3301)
  Update why-xarray.rst with clearer expression (pydata#3307)
  Updater to testing environment name (pydata#3253)
    @dcherian
    dcherian committed Sep 13, 2019
    Configuration menu
    Copy the full SHA
    223c998 View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2019

  1. Update xarray/core/merge.py 

    Co-Authored-By: Stephan Hoyer <shoyer@google.com>
    @dcherian @shoyer
    dcherian and shoyer authored Sep 15, 2019
    Configuration menu
    Copy the full SHA
    d77bf93 View commit details
    Browse the repository at this point in the history

  2. avoid unnecessary computes.

    @dcherian
    dcherian committed Sep 15, 2019
    Configuration menu
    Copy the full SHA
    bdd388f View commit details
    Browse the repository at this point in the history

  3. Merge branch 'compat-override' of github.com:dcherian/xarray into com… 

    …pat-override

* 'compat-override' of github.com:dcherian/xarray:
  Update xarray/core/merge.py
    @dcherian
    dcherian committed Sep 15, 2019
    Configuration menu
    Copy the full SHA
    c6670e4 View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2019

  1. minor cleanups.

    @dcherian
    dcherian committed Sep 16, 2019
    Configuration menu
    Copy the full SHA
    50d3b8f View commit details
    Browse the repository at this point in the history