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

Aggregation functions and other minor fixes #35

Merged
merged 62 commits into from Aug 22, 2022
Merged

Aggregation functions and other minor fixes #35

merged 62 commits into from Aug 22, 2022

Commits on Jul 26, 2022

  1. aggregation functionalities

    @RondeauG
    RondeauG committed Jul 26, 2022
    Configuration menu
    Copy the full SHA
    7479d74 View commit details
    Browse the repository at this point in the history

  2. fix CV making circular imports

    @RondeauG
    RondeauG committed Jul 26, 2022
    Configuration menu
    Copy the full SHA
    9dff340 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into ensemble-selection

    @RondeauG
    RondeauG committed Jul 26, 2022
    Configuration menu
    Copy the full SHA
    7a534e3 View commit details
    Browse the repository at this point in the history

  4. docstrings

    @RondeauG
    RondeauG committed Jul 26, 2022
    Configuration menu
    Copy the full SHA
    dd38308 View commit details
    Browse the repository at this point in the history

  5. docstrings

    @RondeauG
    RondeauG committed Jul 26, 2022
    Configuration menu
    Copy the full SHA
    e091c19 View commit details
    Browse the repository at this point in the history

  6. fix for parse_directory ignoring new columns

    @RondeauG
    RondeauG committed Jul 26, 2022
    Configuration menu
    Copy the full SHA
    fe59f9d View commit details
    Browse the repository at this point in the history

  7. Merge branch 'fix-parse-id' into ensemble-selection

    @RondeauG
    RondeauG committed Jul 26, 2022
    Configuration menu
    Copy the full SHA
    0cd10c1 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2022

  1. test for gitlab

    @RondeauG
    RondeauG committed Jul 27, 2022
    Configuration menu
    Copy the full SHA
    9fd0da2 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into ensemble-selection

    @RondeauG
    RondeauG committed Jul 27, 2022
    Configuration menu
    Copy the full SHA
    9e13f5a View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2022

  1. Merge branch 'main' into ensemble-selection

    @Zeitsperre
    Zeitsperre committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    83c7569 View commit details
    Browse the repository at this point in the history

  2. implement __all__ in modules, add missing static typing, correct some… 

    … grammar issues, update requirements to reflect imported libraries, drop Python3.7 in tox, remove unused imports.
    @Zeitsperre
    Zeitsperre committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    487189f View commit details
    Browse the repository at this point in the history

  3. pre-commit fixes

    @Zeitsperre
    Zeitsperre committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    ebd6334 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2022

  1. Update xscen/catalog.py 

    Co-authored-by: juliettelavoie <juliette.lavoie@hotmail.ca>
    @Zeitsperre @juliettelavoie
    Zeitsperre and juliettelavoie committed Jul 29, 2022
    Configuration menu
    Copy the full SHA
    5919007 View commit details
    Browse the repository at this point in the history

  2. refactoring based on internal discussion (#40)

    @Zeitsperre
    Zeitsperre committed Jul 29, 2022
    Configuration menu
    Copy the full SHA
    5b93500 View commit details
    Browse the repository at this point in the history

  3. refactoring based on internal discussion (#40)

    @Zeitsperre
    Zeitsperre committed Jul 29, 2022
    Configuration menu
    Copy the full SHA
    0708b4e View commit details
    Browse the repository at this point in the history

  4. sort lines, update dependencies based on direct imports, static typing

    @Zeitsperre
    Zeitsperre committed Jul 29, 2022
    Configuration menu
    Copy the full SHA
    52557d6 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2022

  1. refactor filenames based on discussion, propose `regrid.regrid_datase… 

    …t()` as refactoring of `regrid.regrid()`
    @Zeitsperre
    Zeitsperre committed Aug 1, 2022
    Configuration menu
    Copy the full SHA
    7a8ae5e View commit details
    Browse the repository at this point in the history

  2. add ensembles and remove unused finalize imports

    @Zeitsperre
    Zeitsperre committed Aug 1, 2022
    Configuration menu
    Copy the full SHA
    94428f7 View commit details
    Browse the repository at this point in the history

  3. Move selected functions to top-level, create _ops for specific cross-… 

    …subject functions
    @Zeitsperre
    Zeitsperre committed Aug 1, 2022
    Configuration menu
    Copy the full SHA
    907fda9 View commit details
    Browse the repository at this point in the history

  4. update history and add __all__ to _ops.py

    @Zeitsperre
    Zeitsperre committed Aug 1, 2022
    Configuration menu
    Copy the full SHA
    7f8617a View commit details
    Browse the repository at this point in the history

  5. Adjust documentation to reflect new structure, use autodoc to provide… 

    … package index, import CV at top-level, update HISTORY.rst
    @Zeitsperre
    Zeitsperre committed Aug 1, 2022
    Configuration menu
    Copy the full SHA
    3139481 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'main' into ensemble-selection

    @Zeitsperre
    Zeitsperre committed Aug 1, 2022
    Configuration menu
    Copy the full SHA
    5e3f4c6 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2022

  1. Merge branch 'ensemble-selection' into api_refactoring

    @Zeitsperre
    Zeitsperre committed Aug 2, 2022
    Configuration menu
    Copy the full SHA
    67cb7a2 View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2022

  1. Apply suggestions from code review 

    Co-authored-by: RondeauG <38501935+RondeauG@users.noreply.github.com>
    @Zeitsperre @RondeauG
    Zeitsperre and RondeauG committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    5f434d7 View commit details
    Browse the repository at this point in the history

  2. [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 Aug 3, 2022
    Configuration menu
    Copy the full SHA
    9eecb31 View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2022

  1. Large refactoring of all modules and functions to expose specific fun… 

    …ctions and modules at the top-level
    @Zeitsperre
    Zeitsperre committed Aug 4, 2022
    Configuration menu
    Copy the full SHA
    a3fb48a View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2022

  1. Apply suggestions from code review 

    Co-authored-by: Pascal Bourgault <bourgault.pascal@ouranos.ca>
    @Zeitsperre @aulemahal
    Zeitsperre and aulemahal committed Aug 9, 2022
    Configuration menu
    Copy the full SHA
    72841e6 View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2022

  1. add ensembles to docs

    @juliettelavoie
    juliettelavoie committed Aug 11, 2022
    Configuration menu
    Copy the full SHA
    0e5b375 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/api_refactoring' into api_refact… 

    …oring
    @juliettelavoie
    juliettelavoie committed Aug 11, 2022
    Configuration menu
    Copy the full SHA
    e301bb2 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into ensemble-selection

    @Zeitsperre
    Zeitsperre committed Aug 11, 2022
    Configuration menu
    Copy the full SHA
    119484a View commit details
    Browse the repository at this point in the history

  4. Merge branch 'ensemble-selection' into api_refactoring 

    # Conflicts:
#	HISTORY.rst
#	xscen/_regrid.py
#	xscen/common.py
    @Zeitsperre
    Zeitsperre committed Aug 11, 2022
    Configuration menu
    Copy the full SHA
    b4867bc View commit details
    Browse the repository at this point in the history

  5. merge files

    @Zeitsperre
    Zeitsperre committed Aug 11, 2022
    Configuration menu
    Copy the full SHA
    51293d6 View commit details
    Browse the repository at this point in the history

  6. apply suggested changes

    @Zeitsperre
    Zeitsperre committed Aug 11, 2022
    Configuration menu
    Copy the full SHA
    46dcf68 View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2022

  1. Update xscen/indicators.py 

    Co-authored-by: juliettelavoie <juliette.lavoie@hotmail.ca>
    @RondeauG @juliettelavoie
    RondeauG and juliettelavoie committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    bf7d296 View commit details
    Browse the repository at this point in the history

  2. Update xscen/indicators.py 

    Co-authored-by: juliettelavoie <juliette.lavoie@hotmail.ca>
    @RondeauG @juliettelavoie
    RondeauG and juliettelavoie committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    581a801 View commit details
    Browse the repository at this point in the history

  3. Update xscen/aggregate.py 

    Co-authored-by: juliettelavoie <juliette.lavoie@hotmail.ca>
    @RondeauG @juliettelavoie
    RondeauG and juliettelavoie committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    dd199cd View commit details
    Browse the repository at this point in the history

  4. Update xscen/aggregate.py 

    Co-authored-by: juliettelavoie <juliette.lavoie@hotmail.ca>
    @RondeauG @juliettelavoie
    RondeauG and juliettelavoie committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    e7a37d2 View commit details
    Browse the repository at this point in the history

  5. Update xscen/aggregate.py 

    Co-authored-by: juliettelavoie <juliette.lavoie@hotmail.ca>
    @RondeauG @juliettelavoie
    RondeauG and juliettelavoie committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    3aa3cb2 View commit details
    Browse the repository at this point in the history

  6. deltas keep all horizons

    @RondeauG
    RondeauG committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    6e8ca94 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'ensemble-selection' of github.com:Ouranosinc/xscen into… 

    … ensemble-selection
    @RondeauG
    RondeauG committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    99df411 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'main' into ensemble-selection

    @aulemahal
    aulemahal committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    5651241 View commit details
    Browse the repository at this point in the history

  9. merge

    @aulemahal
    aulemahal committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    8a2c28b View commit details
    Browse the repository at this point in the history

  10. Apply correction from suggestions from the meeting

    @aulemahal
    aulemahal committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    d94e20f View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2022

  1. Apply suggestions from code review 

    Co-authored-by: juliettelavoie <juliette.lavoie@hotmail.ca>
    @Zeitsperre @juliettelavoie
    Zeitsperre and juliettelavoie committed Aug 17, 2022
    Configuration menu
    Copy the full SHA
    3155f8a View commit details
    Browse the repository at this point in the history

  2. change checkups for diagnostics.py

    @juliettelavoie
    juliettelavoie committed Aug 17, 2022
    Configuration menu
    Copy the full SHA
    214fc3a View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/api_refactoring' into api_refact… 

    …oring
    @juliettelavoie
    juliettelavoie committed Aug 17, 2022
    Configuration menu
    Copy the full SHA
    26e7a2c View commit details
    Browse the repository at this point in the history

  4. adjust docs and add aggregate to available modules

    @Zeitsperre
    Zeitsperre committed Aug 17, 2022
    Configuration menu
    Copy the full SHA
    7156ddd View commit details
    Browse the repository at this point in the history

  5. add load_config to top-level

    @Zeitsperre
    Zeitsperre committed Aug 17, 2022
    Configuration menu
    Copy the full SHA
    9eff738 View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2022

  1. Merge pull request #41 from Ouranosinc/api_refactoring 

    API refactoring
    @Zeitsperre
    Zeitsperre committed Aug 18, 2022
    Configuration menu
    Copy the full SHA
    2a4bbc1 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into ensemble-selection

    @Zeitsperre
    Zeitsperre committed Aug 18, 2022
    Configuration menu
    Copy the full SHA
    79bc29b View commit details
    Browse the repository at this point in the history

  3. removed a reference to lat/lon

    @RondeauG
    RondeauG committed Aug 18, 2022
    Configuration menu
    Copy the full SHA
    c7bc8e5 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'ensemble-selection' of github.com:Ouranosinc/xscen into… 

    … ensemble-selection

Conflicts:
	xscen/catalog.py
    @RondeauG
    RondeauG committed Aug 18, 2022
    Configuration menu
    Copy the full SHA
    85425bd View commit details
    Browse the repository at this point in the history

  5. notebooks

    @RondeauG
    RondeauG committed Aug 18, 2022
    Configuration menu
    Copy the full SHA
    f0a0b03 View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2022

  1. more robust detection of X and Y for mean()

    @RondeauG
    RondeauG committed Aug 22, 2022
    Configuration menu
    Copy the full SHA
    6823af4 View commit details
    Browse the repository at this point in the history

  2. renaming in deltas is optional

    @RondeauG
    RondeauG committed Aug 22, 2022
    Configuration menu
    Copy the full SHA
    83b6912 View commit details
    Browse the repository at this point in the history

  3. updated HISTORY

    @RondeauG
    RondeauG committed Aug 22, 2022
    Configuration menu
    Copy the full SHA
    07948a8 View commit details
    Browse the repository at this point in the history

  4. Update xscen/aggregate.py 

    Co-authored-by: juliettelavoie <juliette.lavoie@hotmail.ca>
    @RondeauG @juliettelavoie
    RondeauG and juliettelavoie committed Aug 22, 2022
    Configuration menu
    Copy the full SHA
    c2f8268 View commit details
    Browse the repository at this point in the history

  5. [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 Aug 22, 2022
    Configuration menu
    Copy the full SHA
    599b07e View commit details
    Browse the repository at this point in the history

  6. Update xscen/aggregate.py 

    Co-authored-by: juliettelavoie <juliette.lavoie@hotmail.ca>
    @RondeauG @juliettelavoie
    RondeauG and juliettelavoie committed Aug 22, 2022
    Configuration menu
    Copy the full SHA
    1a73708 View commit details
    Browse the repository at this point in the history

  7. [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 Aug 22, 2022
    Configuration menu
    Copy the full SHA
    a8f2f51 View commit details
    Browse the repository at this point in the history

  8. updated notebooks

    @RondeauG
    RondeauG committed Aug 22, 2022
    Configuration menu
    Copy the full SHA
    b248549 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'ensemble-selection' of github.com:Ouranosinc/xscen into… 

    … ensemble-selection
    @RondeauG
    RondeauG committed Aug 22, 2022
    Configuration menu
    Copy the full SHA
    ffc3791 View commit details
    Browse the repository at this point in the history