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

Data.equals: add unit test & migrate to Dask #254

Merged
merged 57 commits into from Jan 21, 2022
Merged

Data.equals: add unit test & migrate to Dask #254

merged 57 commits into from Jan 21, 2022

Commits on Nov 5, 2021

  1. Remove redundant tests on log messages; now test_Data_equals passes

    @sadielbartholomew
    sadielbartholomew committed Nov 5, 2021
    Configuration menu
    Copy the full SHA
    6eafaf5 View commit details
    Browse the repository at this point in the history

  2. New approach to equals() migration: define own da.ma.allclose

    @sadielbartholomew
    sadielbartholomew committed Nov 5, 2021
    Configuration menu
    Copy the full SHA
    ee6ed32 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2021

  1. Flesh out docstring for new internal utility method _da_ma_allclose()

    @sadielbartholomew
    sadielbartholomew committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    2f16574 View commit details
    Browse the repository at this point in the history

  2. Document undoc'd kwargs for Data.equals() method

    @sadielbartholomew
    sadielbartholomew committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    22a0fee View commit details
    Browse the repository at this point in the history

  3. Add note in Data.equals() providing & regarding old log message

    @sadielbartholomew
    sadielbartholomew committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    309e91d View commit details
    Browse the repository at this point in the history

  4. Set all daskified decorator log levels to default, to adapt as req.

    @sadielbartholomew
    sadielbartholomew committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    419e6de View commit details
    Browse the repository at this point in the history

  5. Add basic (excluding parameters) unit test for Data.equals

    @sadielbartholomew
    sadielbartholomew committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    9735498 View commit details
    Browse the repository at this point in the history

  6. Migrate Data.equals from LAMA to Dask

    @sadielbartholomew
    sadielbartholomew committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    caad9cb View commit details
    Browse the repository at this point in the history

  7. Address several DeprecationWarning warnings raised by pytest 

    Also fix some issues in the functions module so flake8 passes
    @sadielbartholomew
    sadielbartholomew committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    90af93b View commit details
    Browse the repository at this point in the history

  8. Improve test by adding assertions on raised log messages

    @sadielbartholomew
    sadielbartholomew committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    6c1fff5 View commit details
    Browse the repository at this point in the history

  9. Fix equality test w/ numpy inf & NaN by comparing to array of same dtype

    @sadielbartholomew
    sadielbartholomew committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    0e916c0 View commit details
    Browse the repository at this point in the history

  10. Complete Data.equals unit test by covering all valid parameters

    @sadielbartholomew
    sadielbartholomew committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    ea54b2c View commit details
    Browse the repository at this point in the history

  11. Add missing closibng parenthesis in log message for differing Data units

    @sadielbartholomew
    sadielbartholomew committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    bf3d58a View commit details
    Browse the repository at this point in the history

  12. Conversions from str.format() to f-strings

    @sadielbartholomew
    sadielbartholomew committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    d85b5cf View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2021

  1. Potential alt. approach: pre-compute result inside Data.equals()

    @sadielbartholomew
    sadielbartholomew committed Nov 9, 2021
    Configuration menu
    Copy the full SHA
    8a4005b View commit details
    Browse the repository at this point in the history

  2. Add developer notes on questions RE laziness of execution

    @sadielbartholomew
    sadielbartholomew committed Nov 9, 2021
    1 Configuration menu
    Copy the full SHA
    7a01cbe View commit details
    Browse the repository at this point in the history

  3. Update developer notes with further points from discussion

    @sadielbartholomew
    sadielbartholomew committed Nov 9, 2021
    Configuration menu
    Copy the full SHA
    73ebee7 View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2021

  1. Update _da_ma_allclose to use blockwise() in line with DH suggestion

    @sadielbartholomew
    sadielbartholomew committed Nov 10, 2021
    Configuration menu
    Copy the full SHA
    db3b871 View commit details
    Browse the repository at this point in the history

  2. Add checking on scalar inputs to test_Data_equals

    @sadielbartholomew
    sadielbartholomew committed Nov 10, 2021
    Configuration menu
    Copy the full SHA
    cbc67a5 View commit details
    Browse the repository at this point in the history

  3. Add test module for the Data utility functions, test_Data_utils

    @sadielbartholomew
    sadielbartholomew committed Nov 10, 2021
    Configuration menu
    Copy the full SHA
    053c467 View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2021

  1. Some fixes to logic in _da_ma_allclose

    @sadielbartholomew
    sadielbartholomew committed Nov 11, 2021
    Configuration menu
    Copy the full SHA
    845255b View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2021

  1. Move _da_ma_allclose from data.utils to data.dask_utils

    @sadielbartholomew
    sadielbartholomew committed Nov 12, 2021
    Configuration menu
    Copy the full SHA
    2b73fad View commit details
    Browse the repository at this point in the history

  2. Improve handling of scalars and 0-d arrays in _da_ma_allclose

    @sadielbartholomew
    sadielbartholomew committed Nov 12, 2021
    Configuration menu
    Copy the full SHA
    1cf0312 View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2021

  1. Update _da_ma_allclose test to highlight difference w/ Data.equals

    @sadielbartholomew
    sadielbartholomew committed Nov 15, 2021
    Configuration menu
    Copy the full SHA
    97478b2 View commit details
    Browse the repository at this point in the history

  2. Update masked array coverage in test_Data_equals

    @sadielbartholomew
    sadielbartholomew committed Nov 15, 2021
    Configuration menu
    Copy the full SHA
    8db307b View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2021

  1. Add self-equality & masked string array checks to test_Data_equals

    @sadielbartholomew
    sadielbartholomew committed Nov 16, 2021
    Configuration menu
    Copy the full SHA
    63161e6 View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2021

  1. _da_ma_allclose: set kwargs in inner function w/ note explaining why

    @sadielbartholomew
    sadielbartholomew committed Nov 17, 2021
    Configuration menu
    Copy the full SHA
    b78551b View commit details
    Browse the repository at this point in the history

  2. Update developer notes with agreed approach to cf.Data method laziness

    @sadielbartholomew
    sadielbartholomew committed Nov 17, 2021
    Configuration menu
    Copy the full SHA
    153dee0 View commit details
    Browse the repository at this point in the history

  3. Re-organise developer notes to tidy

    @sadielbartholomew
    sadielbartholomew committed Nov 17, 2021
    Configuration menu
    Copy the full SHA
    71f1110 View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2021

  1. Add utility function to check if an array is of numeric dtype

    @sadielbartholomew
    sadielbartholomew committed Nov 18, 2021
    Configuration menu
    Copy the full SHA
    69a8d33 View commit details
    Browse the repository at this point in the history

  2. Data.equals: use appropriate data comparison for non-numeric dtypes

    @sadielbartholomew
    sadielbartholomew committed Nov 18, 2021
    Configuration menu
    Copy the full SHA
    d98feca View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2021

  1. Debugging of data comparison: add print statements to illustrate

    @sadielbartholomew
    sadielbartholomew committed Nov 19, 2021
    Configuration menu
    Copy the full SHA
    e14f246 View commit details
    Browse the repository at this point in the history

Commits on Nov 24, 2021

  1. CI: add test_Data_utils to Dask testing workflow

    @sadielbartholomew
    sadielbartholomew committed Nov 24, 2021
    Configuration menu
    Copy the full SHA
    3053ccb View commit details
    Browse the repository at this point in the history

  2. Remove maximum version spec. for cfdm for ease of development

    @sadielbartholomew
    sadielbartholomew committed Nov 24, 2021
    Configuration menu
    Copy the full SHA
    3e1aa67 View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2022

  1. Address DH feedback by using cf defaults for rtol & atol values

    @sadielbartholomew
    sadielbartholomew committed Jan 10, 2022
    Configuration menu
    Copy the full SHA
    c227e49 View commit details
    Browse the repository at this point in the history

  2. Update self-equality tests in test_Data_equals to use copies

    @sadielbartholomew
    sadielbartholomew committed Jan 10, 2022
    Configuration menu
    Copy the full SHA
    f1094d3 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2022

  1. Address DH feedback: update expected test result for special case

    @sadielbartholomew
    sadielbartholomew committed Jan 11, 2022
    Configuration menu
    Copy the full SHA
    1d2a674 View commit details
    Browse the repository at this point in the history

  2. Update development notes for cf.Data RE arrays that may be masked

    @sadielbartholomew
    sadielbartholomew committed Jan 11, 2022
    Configuration menu
    Copy the full SHA
    66e7a05 View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2022

  1. Indicate tests failing due to inconsistent cfdm Data.equals

    @sadielbartholomew
    sadielbartholomew committed Jan 12, 2022
    Configuration menu
    Copy the full SHA
    b09a57a View commit details
    Browse the repository at this point in the history

  2. Set masked_equal=True inside Data.equals to fix self-equality tests

    @sadielbartholomew
    sadielbartholomew committed Jan 12, 2022
    Configuration menu
    Copy the full SHA
    f71353f View commit details
    Browse the repository at this point in the history

  3. Merge branch 'lama-to-dask' into lama-to-dask-6-new

    @sadielbartholomew
    sadielbartholomew committed Jan 12, 2022
    Configuration menu
    Copy the full SHA
    b16f610 View commit details
    Browse the repository at this point in the history

  4. Tidy PR 254: remove all dev. aid print statements

    @sadielbartholomew
    sadielbartholomew committed Jan 12, 2022
    Configuration menu
    Copy the full SHA
    d3d5198 View commit details
    Browse the repository at this point in the history

Commits on Jan 13, 2022

  1. Update Data.equals to check for strict datatype equality

    @sadielbartholomew
    sadielbartholomew committed Jan 13, 2022
    Configuration menu
    Copy the full SHA
    2f14b3e View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2022

  1. Comments in preparation for eventual equal_nan kwarg to Data.equals

    @sadielbartholomew
    sadielbartholomew committed Jan 17, 2022
    Configuration menu
    Copy the full SHA
    e296061 View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2022

  1. Update cf/data/utils.py: more accurate docstring 

    Co-authored-by: David Hassell <davidhassell@users.noreply.github.com>
    @sadielbartholomew @davidhassell
    sadielbartholomew and davidhassell committed Jan 18, 2022
    Configuration menu
    Copy the full SHA
    5d6838a View commit details
    Browse the repository at this point in the history

  2. Update cf/data/dask_utils.py: improve docstring formatting 

    Co-authored-by: David Hassell <davidhassell@users.noreply.github.com>
    @sadielbartholomew @davidhassell
    sadielbartholomew and davidhassell committed Jan 18, 2022
    Configuration menu
    Copy the full SHA
    201a91f View commit details
    Browse the repository at this point in the history

  3. Update cf/test/test_Data.py: test equality to self (not a copy) 

    Co-authored-by: David Hassell <davidhassell@users.noreply.github.com>
    @sadielbartholomew @davidhassell
    sadielbartholomew and davidhassell committed Jan 18, 2022
    Configuration menu
    Copy the full SHA
    981ad20 View commit details
    Browse the repository at this point in the history

  4. Update cf/data/dask_utils.py: document kwarg type 

    Co-authored-by: David Hassell <davidhassell@users.noreply.github.com>
    @sadielbartholomew @davidhassell
    sadielbartholomew and davidhassell committed Jan 18, 2022
    Configuration menu
    Copy the full SHA
    bc9a434 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'lama-to-dask' into lama-to-dask-6-new

    @sadielbartholomew
    sadielbartholomew committed Jan 18, 2022
    Configuration menu
    Copy the full SHA
    4c86612 View commit details
    Browse the repository at this point in the history

  6. Address DH feedback by removing loop over pairs in test_Data_equals

    @sadielbartholomew
    sadielbartholomew committed Jan 18, 2022
    Configuration menu
    Copy the full SHA
    42e6263 View commit details
    Browse the repository at this point in the history

  7. Address DH feedback: do not check numpy arrays in test_Data_utils

    @sadielbartholomew
    sadielbartholomew committed Jan 18, 2022
    Configuration menu
    Copy the full SHA
    3846d07 View commit details
    Browse the repository at this point in the history

  8. Address DH feedback: adjust test_Daya_equals RE string dtypes

    @sadielbartholomew
    sadielbartholomew committed Jan 18, 2022
    Configuration menu
    Copy the full SHA
    35b5adb View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2022

  1. Address DH feedback: use multiple dask chunks in test_Data_equals

    @sadielbartholomew
    sadielbartholomew committed Jan 19, 2022
    Configuration menu
    Copy the full SHA
    7cd2e89 View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2022

  1. Update test_Data verbosity management and testing

    @sadielbartholomew
    sadielbartholomew committed Jan 20, 2022
    Configuration menu
    Copy the full SHA
    aedec2f View commit details
    Browse the repository at this point in the history

  2. Address isort & black linting failures from master merge & PR

    @sadielbartholomew
    sadielbartholomew committed Jan 20, 2022
    Configuration menu
    Copy the full SHA
    8467f6e View commit details
    Browse the repository at this point in the history

  3. Address all flake linting failures except is*_small

    @sadielbartholomew
    sadielbartholomew committed Jan 20, 2022
    Configuration menu
    Copy the full SHA
    f272842 View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2022

  1. Address remaining flake linting failures: is*_small

    @sadielbartholomew
    sadielbartholomew committed Jan 21, 2022
    Configuration menu
    Copy the full SHA
    07d937d View commit details
    Browse the repository at this point in the history