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

Avoid auto creation of indexes in concat #8872

Merged
merged 81 commits into from
May 8, 2024
Merged

Avoid auto creation of indexes in concat #8872

merged 81 commits into from
May 8, 2024

Commits on Mar 25, 2024

  1. test not creating indexes on concatenation

    @TomNicholas
    TomNicholas committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    22995e9 View commit details
    Browse the repository at this point in the history

  2. construct result dataset using Coordinates object with indexes passed… 

    … explicitly
    @TomNicholas
    TomNicholas committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    7142c9f View commit details
    Browse the repository at this point in the history

  3. remove unnecessary overwriting of indexes

    @TomNicholas
    TomNicholas committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    7fb075a View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2024

  1. ConcatenatableArray class

    @TomNicholas
    TomNicholas committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    285c1de View commit details
    Browse the repository at this point in the history

  2. use ConcatenableArray in tests

    @TomNicholas
    TomNicholas committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    cc24757 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into concat-avoid-index-auto-creation

    @TomNicholas
    TomNicholas committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    90a2592 View commit details
    Browse the repository at this point in the history

  4. add regression tests

    @TomNicholas
    TomNicholas committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    beb665a View commit details
    Browse the repository at this point in the history

  5. fix by performing check

    @TomNicholas
    TomNicholas committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    22f361d View commit details
    Browse the repository at this point in the history

  6. refactor assert_valid_explicit_coords and rename dims->sizes

    @TomNicholas
    TomNicholas committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    55166fc View commit details
    Browse the repository at this point in the history

  7. Merge branch 'forbid_invalid_coordinates' into concat-avoid-index-aut… 

    …o-creation
    @TomNicholas
    TomNicholas committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    322b76e View commit details
    Browse the repository at this point in the history

  8. Revert "add regression tests" 

    This reverts commit beb665a.
    @TomNicholas
    TomNicholas committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    da6692b View commit details
    Browse the repository at this point in the history

  9. Revert "fix by performing check" 

    This reverts commit 22f361d.
    @TomNicholas
    TomNicholas committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    35dfb67 View commit details
    Browse the repository at this point in the history

  10. Revert "refactor assert_valid_explicit_coords and rename dims->sizes" 

    This reverts commit 55166fc.
    @TomNicholas
    TomNicholas committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    fd3de2b View commit details
    Browse the repository at this point in the history

  11. Merge branch 'main' into concat-avoid-index-auto-creation

    @TomNicholas
    TomNicholas committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    0a60172 View commit details
    Browse the repository at this point in the history

  12. fix failing test

    @TomNicholas
    TomNicholas committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    21afbb1 View commit details
    Browse the repository at this point in the history

  13. possible fix for failing groupby test

    @TomNicholas
    TomNicholas committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    6e9ead6 View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2024

  1. Revert "possible fix for failing groupby test" 

    This reverts commit 6e9ead6.
    @TomNicholas
    TomNicholas committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    2534712 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2024

  1. test expand_dims doesn't create Index

    @TomNicholas
    TomNicholas committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    3e848eb View commit details
    Browse the repository at this point in the history

  2. add option to not create 1D index in expand_dims

    @TomNicholas
    TomNicholas committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    95d453c View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2024

  1. refactor tests to consider data variables and coordinate variables se… 

    …parately
    @TomNicholas
    TomNicholas committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    ba5627e View commit details
    Browse the repository at this point in the history

  2. test expand_dims doesn't create Index

    @TomNicholas
    TomNicholas committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    3719ba7 View commit details
    Browse the repository at this point in the history

  3. add option to not create 1D index in expand_dims

    @TomNicholas
    TomNicholas committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    018e74b View commit details
    Browse the repository at this point in the history

  4. refactor tests to consider data variables and coordinate variables se… 

    …parately
    @TomNicholas
    TomNicholas committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    f680505 View commit details
    Browse the repository at this point in the history

  5. fix bug causing new test to fail

    @TomNicholas
    TomNicholas committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    f10509a View commit details
    Browse the repository at this point in the history

  6. test index auto-creation when iterable passed as new coordinate values

    @TomNicholas
    TomNicholas committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    8152c0a View commit details
    Browse the repository at this point in the history

  7. make test for iterable pass

    @TomNicholas
    TomNicholas committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    aa813cf View commit details
    Browse the repository at this point in the history

  8. added kwarg to dataarray

    @TomNicholas
    TomNicholas committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    e78de7d View commit details
    Browse the repository at this point in the history

  9. whatsnew

    @TomNicholas
    TomNicholas committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    b1329cc View commit details
    Browse the repository at this point in the history

  10. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    a9f7e0c View commit details
    Browse the repository at this point in the history

  11. Revert "refactor tests to consider data variables and coordinate vari… 

    …ables separately"

This reverts commit ba5627e.
    @TomNicholas
    TomNicholas committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    2ce3dec View commit details
    Browse the repository at this point in the history

  12. Revert "add option to not create 1D index in expand_dims" 

    This reverts commit 95d453c.
    @TomNicholas
    TomNicholas committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    87a08b4 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'expand_dims_create_1d_index' into concat-avoid-index-au… 

    …to-creation
    @TomNicholas
    TomNicholas committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    e0c6db1 View commit details
    Browse the repository at this point in the history

  14. test that concat doesn't raise if create_1d_index=False

    @TomNicholas
    TomNicholas committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    214ed7d View commit details
    Browse the repository at this point in the history

  15. make test pass by passing create_1d_index down through concat

    @TomNicholas
    TomNicholas committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    78d2798 View commit details
    Browse the repository at this point in the history

  16. assert that an UnexpectedDataAccess error is raised when create_1d_in… 

    …dex=True
    @TomNicholas
    TomNicholas committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    fc206b0 View commit details
    Browse the repository at this point in the history

  17. eliminate possibility of xarray internals bypassing UnexpectedDataAcc… 

    …ess error by accessing .array
    @TomNicholas
    TomNicholas committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    ce797f1 View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2024

  1. update tests to use private versions of assertions

    @TomNicholas
    TomNicholas committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    62e750f View commit details
    Browse the repository at this point in the history

  2. create_1d_index->create_index

    @TomNicholas
    TomNicholas committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    f86c82f View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into expand_dims_create_1d_index

    @TomNicholas
    TomNicholas committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    4dd8d3c View commit details
    Browse the repository at this point in the history

  4. Update doc/whats-new.rst 

    Co-authored-by: Deepak Cherian <[email protected]>
    @TomNicholas @dcherian
    TomNicholas and dcherian authored Apr 26, 2024
    Configuration menu
    Copy the full SHA
    d5d90fd View commit details
    Browse the repository at this point in the history

  5. Merge branch 'expand_dims_create_1d_index' into concat-avoid-index-au… 

    …to-creation
    @TomNicholas
    TomNicholas committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    e00dbab View commit details
    Browse the repository at this point in the history

  6. Rename create_1d_index -> create_index

    @TomNicholas
    TomNicholas committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    5bb88b8 View commit details
    Browse the repository at this point in the history

  7. fix ConcatenatableArray

    @TomNicholas
    TomNicholas committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    1d471b1 View commit details
    Browse the repository at this point in the history

  8. formatting

    @TomNicholas
    TomNicholas committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    766605d View commit details
    Browse the repository at this point in the history

  9. Merge branch 'main' into concat-avoid-index-auto-creation

    @TomNicholas
    TomNicholas committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    971287f View commit details
    Browse the repository at this point in the history

  10. whatsnew

    @TomNicholas
    TomNicholas committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    10c0ed5 View commit details
    Browse the repository at this point in the history

  11. add new create_index kwarg to overloads

    @TomNicholas
    TomNicholas committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    51eea5d View commit details
    Browse the repository at this point in the history

  12. split vars into data_vars and coord_vars in one loop

    @TomNicholas
    TomNicholas committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    bde9f2b View commit details
    Browse the repository at this point in the history

  13. avoid mypy error by using new variable name

    @TomNicholas
    TomNicholas committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    d5241ce View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2024

  1. warn if create_index=True but no index created because dimension vari… 

    …able was a data var not a coord
    @TomNicholas
    TomNicholas committed Apr 27, 2024
    Configuration menu
    Copy the full SHA
    7e8f895 View commit details
    Browse the repository at this point in the history

  2. add string marks in warning message

    @TomNicholas
    TomNicholas committed Apr 27, 2024
    Configuration menu
    Copy the full SHA
    ed85446 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into expand_dims_create_1d_index

    @TomNicholas
    TomNicholas authored Apr 27, 2024
    Configuration menu
    Copy the full SHA
    39571ba View commit details
    Browse the repository at this point in the history

  4. Merge branch 'expand_dims_create_1d_index' into concat-avoid-index-au… 

    …to-creation
    @TomNicholas
    TomNicholas committed Apr 27, 2024
    Configuration menu
    Copy the full SHA
    206985b View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main' into concat-avoid-index-auto-creation

    @TomNicholas
    TomNicholas committed Apr 27, 2024
    Configuration menu
    Copy the full SHA
    86998e4 View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2024

  1. regression test for dtype changing in to_stacked_array

    @TomNicholas
    TomNicholas committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    5894724 View commit details
    Browse the repository at this point in the history

  2. correct doctest

    @TomNicholas
    TomNicholas committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    dad9433 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into concat-avoid-index-auto-creation

    @TomNicholas
    TomNicholas committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    b235c09 View commit details
    Browse the repository at this point in the history

  4. Remove outdated comment

    @TomNicholas
    TomNicholas authored Apr 29, 2024
    Configuration menu
    Copy the full SHA
    36a2223 View commit details
    Browse the repository at this point in the history

  5. test we can skip creation of indexes during shape promotion

    @TomNicholas
    TomNicholas committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    e17c13f View commit details
    Browse the repository at this point in the history

  6. make shape promotion test pass

    @TomNicholas
    TomNicholas committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    e8fa857 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'concat-avoid-index-auto-creation' of https://github.com… 

    …/TomNicholas/xarray into concat-avoid-index-auto-creation
    @TomNicholas
    TomNicholas committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    648d5bc View commit details
    Browse the repository at this point in the history

  8. Merge branch 'main' into concat-avoid-index-auto-creation

    @TomNicholas
    TomNicholas committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    deb292c View commit details
    Browse the repository at this point in the history

  9. point to issue in whatsnew

    @TomNicholas
    TomNicholas committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    6dd57a9 View commit details
    Browse the repository at this point in the history

Commits on May 1, 2024

  1. don't create dimension coordinates just to drop them at the end

    @TomNicholas
    TomNicholas committed May 1, 2024
    Configuration menu
    Copy the full SHA
    b0e3612 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into concat-avoid-index-auto-creation

    @TomNicholas
    TomNicholas committed May 1, 2024
    Configuration menu
    Copy the full SHA
    b2f06a0 View commit details
    Browse the repository at this point in the history

  3. Remove ToDo about not using Coordinates object to pass indexes 

    Co-authored-by: Deepak Cherian <[email protected]>
    @TomNicholas @dcherian
    TomNicholas and dcherian authored May 1, 2024
    Configuration menu
    Copy the full SHA
    ff70fc7 View commit details
    Browse the repository at this point in the history

  4. get rid of unlabeled_dims variable entirely

    @TomNicholas
    TomNicholas committed May 1, 2024
    Configuration menu
    Copy the full SHA
    2f97a5c View commit details
    Browse the repository at this point in the history

Commits on May 8, 2024

  1. move ConcatenatableArray and similar to new file

    @TomNicholas
    TomNicholas committed May 8, 2024
    Configuration menu
    Copy the full SHA
    6d825e5 View commit details
    Browse the repository at this point in the history

  2. formatting nit 

    Co-authored-by: Justus Magin <[email protected]>
    @TomNicholas @keewis
    TomNicholas and keewis authored May 8, 2024
    Configuration menu
    Copy the full SHA
    b88b5a6 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'concat-avoid-index-auto-creation' of https://github.com… 

    …/TomNicholas/xarray into concat-avoid-index-auto-creation
    @TomNicholas
    TomNicholas committed May 8, 2024
    Configuration menu
    Copy the full SHA
    30c7408 View commit details
    Browse the repository at this point in the history

  4. renamed create_index -> create_index_for_new_dim in concat

    @TomNicholas
    TomNicholas committed May 8, 2024
    Configuration menu
    Copy the full SHA
    b243150 View commit details
    Browse the repository at this point in the history

  5. renamed create_index -> create_index_for_new_dim in expand_dims

    @TomNicholas
    TomNicholas committed May 8, 2024
    Configuration menu
    Copy the full SHA
    9e9e168 View commit details
    Browse the repository at this point in the history

  6. fix incorrect arg name

    @TomNicholas
    TomNicholas committed May 8, 2024
    Configuration menu
    Copy the full SHA
    dca2fb9 View commit details
    Browse the repository at this point in the history

  7. add example to docstring

    @TomNicholas
    TomNicholas committed May 8, 2024
    Configuration menu
    Copy the full SHA
    c979672 View commit details
    Browse the repository at this point in the history

  8. add example of using new kwarg to docstring of expand_dims

    @TomNicholas
    TomNicholas committed May 8, 2024
    Configuration menu
    Copy the full SHA
    ac27ce0 View commit details
    Browse the repository at this point in the history

  9. add example of using new kwarg to docstring of concat

    @TomNicholas
    TomNicholas committed May 8, 2024
    Configuration menu
    Copy the full SHA
    d73ac48 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'main' into concat-avoid-index-auto-creation

    @TomNicholas
    TomNicholas committed May 8, 2024
    Configuration menu
    Copy the full SHA
    9ebbb33 View commit details
    Browse the repository at this point in the history

  11. re-nit the nit 

    Co-authored-by: Justus Magin <[email protected]>
    @TomNicholas @keewis
    TomNicholas and keewis authored May 8, 2024
    Configuration menu
    Copy the full SHA
    d1b656d View commit details
    Browse the repository at this point in the history

  12. more instances of the nit

    @keewis
    keewis authored May 8, 2024
    Configuration menu
    Copy the full SHA
    ac998e9 View commit details
    Browse the repository at this point in the history

  13. fix docstring doctest formatting nit

    @TomNicholas
    TomNicholas committed May 8, 2024
    Configuration menu
    Copy the full SHA
    0849b94 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'concat-avoid-index-auto-creation' of https://github.com… 

    …/TomNicholas/xarray into concat-avoid-index-auto-creation
    @TomNicholas
    TomNicholas committed May 8, 2024
    Configuration menu
    Copy the full SHA
    25764ca View commit details
    Browse the repository at this point in the history