Code

API for N-dimensional combine#2616

Code

Merged

shoyer merged 111 commits intopydata:masterpydata/xarray:masterfrom TomNicholas:feature/nd_combine_new_apiCopy head branch name to clipboardJun 25, 2019

+2,066-1,077

Commits

Commits on Nov 5, 2018

• concatenates along a single dimension

  TomNicholas

  committed
  88ee12a

Commits on Nov 7, 2018

• Wrote function to find correct tile_IDs from nested list of datasets

  TomNicholas

  committed
  1aaa075

• Wrote function to check that combined_tile_ids structure is valid

  TomNicholas

  committed
  dbb371d

• Added test of 2d-concatenation

  TomNicholas

  committed
  cc4d743

Commits on Nov 8, 2018

• Tests now check that dataset ordering is correct

  TomNicholas

  committed
  d2fc7e7

• Test concatentation along a new dimension

  TomNicholas

  committed
  e3f3699

Commits on Nov 9, 2018

• Started generalising auto_combine to N-D by integrating the N-D concatentation algorithm

  TomNicholas

  committed
  55bf685

Commits on Nov 10, 2018

• All unit tests now passing

  TomNicholas

  committed
  845206c

• Merge branch 'real_master' into feature/nd_combine

  TomNicholas

  committed
  fb66626

• Fixed a failing test which I didn't notice because I don't have pseudoNetCDF

  TomNicholas

  committed
  f4e9aad

Commits on Nov 14, 2018

• Began updating open_mfdataset to handle N-D input

  TomNicholas

  committed
  00004a1

• Refactored to remove duplicate logic in open_mfdataset & auto_combine

  TomNicholas

  committed
  b41e374

• Implemented Shoyers suggestion in #2553 to rewrite the recursive nested list traverser as an iterator

  TomNicholas

  committed
  8672a79

• --amend

  TomNicholas

  committed
  4f56b24

• Now raises ValueError if input not ordered correctly before concatenation

  TomNicholas

  committed
  4cfaf2e

Commits on Nov 22, 2018

• Added some more prototype tests defining desired behaviour more clearly

  TomNicholas

  committed
  9fd1413

Commits on Nov 24, 2018

• Now raises informative errors on invalid forms of input

  TomNicholas

  committed
  8ad0121

Commits on Nov 25, 2018

• Refactoring to alos merge along each dimension

  TomNicholas

  committed
  4b2c544

Commits on Nov 26, 2018

• Refactored to literally just apply the old auto_combine along each dimension

  TomNicholas

  committed
  3d0061e

• Added unit tests for open_mfdatset

  TomNicholas

  committed
  60c93ba

• Removed TODOs

  TomNicholas

  committed
  1824538

Commits on Nov 30, 2018

• Removed format strings

  TomNicholas

  committed
  d380815

• test_get_new_tile_ids now doesn't assume dicts are ordered

  TomNicholas

  committed
  c4bb8d0

• Fixed failing tests on python3.5 caused by accidentally assuming dict was ordered

  TomNicholas

  committed
  6b7f889

• Test for getting new tile id

  TomNicholas

  committed
  58a3648

• Fixed itertoolz import so that it's compatible with older versions

  TomNicholas

  committed
  a12a34a

Commits on Dec 1, 2018

• Increased test coverage

  TomNicholas

  committed
  ada1f4a

• Added toolz as an explicit dependency to pass tests on python2.7

  TomNicholas

  committed
  ef0a30e

• Updated 'what's new'

  TomNicholas

  committed
  3be70bc

• No longer attempts to shortcut all concatenation at once if concat_dims=None

  TomNicholas

  committed
  f266bc3

• Merge branch 'master' into feature/nd_combine

  TomNicholas

  authored
  cf49c2b

• Rewrote using itertools.groupby instead of toolz.itertoolz.groupby to remove hidden dependency on toolz

  TomNicholas

  committed
  878e1f9

• Merged changes from master

  TomNicholas

  committed
  7dea14f

• Fixed erroneous removal of utils import

  TomNicholas

  committed
  e6f25a3

Commits on Dec 2, 2018

• Updated docstrings to include an example of multidimensional concatenation

  TomNicholas

  committed
  f856485

Commits on Dec 5, 2018

• Clarified auto_combine docstring for N-D behaviour

  TomNicholas

  committed
  6305d83

Commits on Dec 10, 2018

• Added unit test for nested list of Datasets with different variables

  TomNicholas

  committed
  ce59da1

• Minor spelling and pep8 fixes

  TomNicholas

  committed
  9fb34cf

Commits on Dec 11, 2018

• Started working on a new api with both auto_combine and manual_combine

  TomNicholas

  committed
  83dedb3

Commits on Dec 17, 2018

• Merged master

  TomNicholas

  committed
  de199a0

Commits on Jan 4, 2019

• Wrote basic function to infer concatenation order from coords.

  Show description for 3e64a83
  TomNicholas

  committed
  3e64a83

• Attempt at finalised version of public-facing API.

  Show description for 963c794
  TomNicholas

  committed
  963c794

• No longer uses entire old auto_combine internally, only concat or merge

  TomNicholas

  committed
  1a66530

• Merged v0.11.1 and v0.11.2 changes

  TomNicholas

  committed
  38d265e

• Updated what's new

  TomNicholas

  committed
  7525b23

• Removed uneeded addition to what's new for old release

  TomNicholas

  committed
  92e120a

• Fixed incomplete merge in docstring for open_mfdataset

  TomNicholas

  committed
  13a7f75

Commits on Jan 6, 2019

• Tests for manual combine passing

  TomNicholas

  committed
  b76e681

• Tests for auto_combine now passing

  TomNicholas

  committed
  c09df8b

• xfailed weird behaviour with manual_combine trying to determine concat_dim

  TomNicholas

  committed
  953d572

• Add auto_combine and manual_combine to API page of docs

  TomNicholas

  committed
  b7bf1ad

• Tests now passing for open_mfdataset

  TomNicholas

  committed
  855d819

• Attempted to merge master in, but #2648 has stumped me

  TomNicholas

  committed
  de7965e

Commits on Jan 7, 2019

• Completed merge so that #2648 is respected, and added tests.

  Show description for bfcb4e3
  TomNicholas

  committed
  bfcb4e3

• Separated the tests for concat and both combines

  TomNicholas

  committed
  eb053cc

• Some PEP8 fixes

  TomNicholas

  committed
  97e508c

• Pre-empting a test which will fail with opening uamiv format

  TomNicholas

  committed
  410b138

• Satisfy pep8speaks bot

  TomNicholas

  committed
  02b6d05

• Python 3.5 compatibile after changing some error string formatting

  TomNicholas

  committed
  0d6f13a

• Order coords using pandas.Index objects

  TomNicholas

  committed
  18e0074

Commits on Jan 15, 2019

• Fixed performance bug from GH #2662

  TomNicholas

  committed
  67f11f3

Commits on Jan 23, 2019

• Removed ToDos about natural sorting of string coords

  TomNicholas

  committed
  3b843f5

Commits on Jan 24, 2019

• Merged master into branch

  TomNicholas

  committed
  540d3d4

• Generalized auto_combine to handle monotonically-decreasing coords too

  TomNicholas

  committed
  bb98d54

Commits on Jan 28, 2019

• Added more examples to docstring for manual_combine

  TomNicholas

  committed
  e3f7523

• Merged master - includes py2 deprecation

  TomNicholas

  committed
  fc36b74

• Added note about globbing aspect of open_mfdataset

  TomNicholas

  committed
  d96595e

• Removed auto-inferring of concatenation dimension in manual_combine

  TomNicholas

  committed
  79f09c0

• Added example to docstring for auto_combine

  TomNicholas

  committed
  e32adb3

• Minor correction to docstring

  TomNicholas

  committed
  da4d605

• Another very minor docstring correction

  TomNicholas

  committed
  c4fe22c

Commits on Feb 27, 2019

• Added test to guard against issue #2777

  TomNicholas

  committed
  66b4c4f

Commits on Mar 3, 2019

• Started deprecation cycle for auto_combine

  TomNicholas

  committed
  90f0c1d

• Fully reverted open_mfdataset tests

  TomNicholas

  committed
  0990dd4

• Updated what's new to match deprecation cycle

  TomNicholas

  committed
  d6277be

• Merge branch 'real_master' into feature/nd_combine_new_api

  TomNicholas

  committed
  b81e77a

• Reverted uamiv test

  TomNicholas

  committed
  bf7d549

• Removed dependency on itertools

  TomNicholas

  committed
  f00770f

• Deprecation tests fixed

  TomNicholas

  committed
  c7c1746

• Satisfy pycodestyle

  TomNicholas

  committed
  f6192ca

Commits on Mar 18, 2019

• Started deprecation cycle of auto_combine

  TomNicholas

  committed
  88f089e

• merged changes from master for v0.12

  TomNicholas

  committed
  2849559

• Added specific error for edge case combine_manual can't handle

  TomNicholas

  committed
  535bc31

• Check that global coordinates are monotonic

  TomNicholas

  committed
  5d818e0

• Highlighted weird behaviour when concatenating with no data variables

  TomNicholas

  committed
  42cd05d

• Added test for impossible-to-auto-combine coordinates

  TomNicholas

  committed
  8a83814

• Removed uneeded test

  TomNicholas

  committed
  e4acbdc

• Satisfy linter

  TomNicholas

  committed
  8e767e2

• Added airspeedvelocity benchmark for combining functions

  TomNicholas

  committed
  3d04112

• Benchmark will take longer now

  TomNicholas

  committed
  06ecef6

• Updated version numbers in deprecation warnings to fit with recent release of 0.12

  TomNicholas

  committed
  513764f

Commits on May 18, 2019

• Updated api docs for new function names

  TomNicholas

  committed
  13364ff

• Fixed docs build failure

  TomNicholas

  committed
  ddfc6dd

Commits on May 19, 2019

• Revert "Fixed docs build failure"

  Show description for e471a42
  TomNicholas

  committed
  e471a42

• Updated documentation with section explaining new functions

  TomNicholas

  committed
  2d5b90f

• Merged master

  TomNicholas

  committed
  8cbf5e1

Commits on May 20, 2019

• Suppressed deprecation warnings in test suite

  TomNicholas

  committed
  9ead34e

• Resolved ToDo by pointing to issue with concat, see #2975

  TomNicholas

  committed
  fab3586

• Various docs fixes

  TomNicholas

  committed
  9d5e29f

Commits on May 28, 2019

• Merged master, resolving conflicts with #2964

  TomNicholas

  committed
  9a33ac6

• Slightly renamed tests to match new name of tested function

  TomNicholas

  committed
  ae7b811

• Included minor suggestions from shoyer

  TomNicholas

  committed
  f4fc03d

• Removed trailing whitespace

  TomNicholas

  committed
  917ebee

Commits on May 29, 2019

• Simplified error message for case combine_manual can't handle

  TomNicholas

  committed
  1e537ba

• Removed filter for deprecation warnings, and added test for if user doesn't supply concat_dim

  TomNicholas

  committed
  7d6845b

Commits on Jun 21, 2019

• Simple fixes suggested by shoyer

  TomNicholas

  committed
  5083471

• Change deprecation warning behaviour

  TomNicholas

  committed
  4cc70ae

• Merged in recent changes to master

  TomNicholas

  committed
  537c405

Commits on Jun 25, 2019

• Merge branch 'master' into feature/nd_combine_new_api

  dcherian

  authored
  2f54127

• linting

  TomNicholas

  committed
  357531f

• Merge branch 'feature/nd_combine_new_api' of https://github.com/TomNicholas/xarray into feature/nd_combine_new_api

  TomNicholas

  committed
  e006875