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.

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

Update master to Pastas 1.1.0 #595

Merged
merged 62 commits into from
May 12, 2023
Merged

Update master to Pastas 1.1.0 #595

merged 62 commits into from
May 12, 2023

Commits on Feb 15, 2023

  1. Update types.py

    martinvonk committed Feb 15, 2023
    Configuration menu
    Copy the full SHA
    19d2fd1 View commit details
    Browse the repository at this point in the history
  2. Update example_uncertainty.py

    remove whitespace
    martinvonk committed Feb 15, 2023
    Configuration menu
    Copy the full SHA
    311def6 View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2023

  1. fix tests

    - temporary(?) fix for tmin/tmax
    - ax.set_xlim("2010", "2015") not working with matplotlib 3.6.1 and pandas 1.5.3
    dbrakenhoff committed Feb 17, 2023
    Configuration menu
    Copy the full SHA
    3eac98a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    205faa9 View commit details
    Browse the repository at this point in the history
  3. codacy fixes for timer.py

    dbrakenhoff committed Feb 17, 2023
    Configuration menu
    Copy the full SHA
    25eeb8b View commit details
    Browse the repository at this point in the history
  4. isort

    dbrakenhoff committed Feb 17, 2023
    Configuration menu
    Copy the full SHA
    4cc49df View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    51f8282 View commit details
    Browse the repository at this point in the history
  6. add tmin/tmax fix to ps.plots.series()

    revert nb change
    dbrakenhoff committed Feb 17, 2023
    Configuration menu
    Copy the full SHA
    10522d3 View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2023

  1. Update plots.py

    make table optional
    martinvonk committed Feb 19, 2023
    Configuration menu
    Copy the full SHA
    b109880 View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2023

  1. Configuration menu
    Copy the full SHA
    a37e95c View commit details
    Browse the repository at this point in the history
  2. Squashed commit of the following:

    commit a37e95c
    Merge: 9a3d810 10522d3
    Author: Davíd Brakenhoff <d.brakenhoff@artesia-water.nl>
    Date:   Mon Feb 20 11:13:50 2023 +0100
    
        Fix datetime axes with pandas.Timestamp and some other improvements (#557)
    
    commit 10522d3
    Author: dbrakenhoff <d.brakenhoff@artesia-water.nl>
    Date:   Fri Feb 17 14:26:33 2023 +0100
    
        add tmin/tmax fix to ps.plots.series()
        revert nb change
    
    commit 51f8282
    Author: Martin Vonk <vonk.mart@gmail.com>
    Date:   Fri Feb 17 13:24:53 2023 +0100
    
        fix notebooks pd Timestamp errors
    
    commit 4cc49df
    Author: dbrakenhoff <d.brakenhoff@artesia-water.nl>
    Date:   Fri Feb 17 12:14:42 2023 +0100
    
        isort
    
    commit 25eeb8b
    Author: dbrakenhoff <d.brakenhoff@artesia-water.nl>
    Date:   Fri Feb 17 12:14:28 2023 +0100
    
        codacy fixes for timer.py
    
    commit 205faa9
    Author: dbrakenhoff <d.brakenhoff@artesia-water.nl>
    Date:   Fri Feb 17 12:13:57 2023 +0100
    
        support linear trends in modelcompare
    
    commit 3eac98a
    Author: dbrakenhoff <d.brakenhoff@artesia-water.nl>
    Date:   Fri Feb 17 12:13:28 2023 +0100
    
        fix tests
        - temporary(?) fix for tmin/tmax
        - ax.set_xlim("2010", "2015") not working with matplotlib 3.6.1 and pandas 1.5.3
    martinvonk committed Feb 20, 2023
    Configuration menu
    Copy the full SHA
    7cbb7f5 View commit details
    Browse the repository at this point in the history
  3. Merge remote-tracking branch 'origin/dev' into 541-enhancement-add-op…

    …tion-for-not-showing-statistics-table-in-pastasplotsseries
    martinvonk committed Feb 20, 2023
    Configuration menu
    Copy the full SHA
    231bb1b View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    307da88 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    d1ad118 View commit details
    Browse the repository at this point in the history
  6. Update plots.py

    fix if statement
    martinvonk committed Feb 20, 2023
    Configuration menu
    Copy the full SHA
    219cad0 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    4c76d63 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    8240ef4 View commit details
    Browse the repository at this point in the history
  9. Update metrics.py

    fix overwrite import
    martinvonk committed Feb 20, 2023
    Configuration menu
    Copy the full SHA
    0222fa3 View commit details
    Browse the repository at this point in the history
  10. Merge branch 'martinvonk-patch-1' of https://github.com/pastas/pastas

    …into martinvonk-patch-1
    martinvonk committed Feb 20, 2023
    Configuration menu
    Copy the full SHA
    c803c73 View commit details
    Browse the repository at this point in the history
  11. add stats summary check

    dbrakenhoff committed Feb 20, 2023
    Configuration menu
    Copy the full SHA
    96de513 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    ef8f88a View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    29ef2f9 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2023

  1. Configuration menu
    Copy the full SHA
    cf48f09 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2023

  1. Fix issue #564

    rubencalje committed Feb 23, 2023
    Configuration menu
    Copy the full SHA
    ea6797e View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2023

  1. Configuration menu
    Copy the full SHA
    15228e0 View commit details
    Browse the repository at this point in the history
  2. Create auto-author-assign.yml

    automatically assign author of pull request
    https://github.com/marketplace/actions/auto-author-assign
    martinvonk committed Feb 27, 2023
    Configuration menu
    Copy the full SHA
    7e97c3f View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2023

  1. Improve modeling with non-daily timesteps (#556)

    Co-authored-by: Martin Vonk <vonk.mart@gmail.com>
    dbrakenhoff and martinvonk committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    47870d3 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2023

  1. ignore some flake8 errors

    black allows these errors
    martinvonk committed Mar 21, 2023
    Configuration menu
    Copy the full SHA
    665f1d1 View commit details
    Browse the repository at this point in the history
  2. fix ref

    martinvonk committed Mar 21, 2023
    Configuration menu
    Copy the full SHA
    a01df01 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    072b6f0 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    1379345 View commit details
    Browse the repository at this point in the history
  5. improve WellModel

    - rfunc=None by default which creates HantushWellModel() instance.
    - #542 improve docstring
    - #543 improve error msg if stress is not list (by moving stress handling up in init)
    dbrakenhoff committed Mar 21, 2023
    Configuration menu
    Copy the full SHA
    5668eb7 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    30d019f View commit details
    Browse the repository at this point in the history
  7. fix nb

    dbrakenhoff committed Mar 21, 2023
    Configuration menu
    Copy the full SHA
    b5c972b View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2023

  1. Configuration menu
    Copy the full SHA
    ed56bcf View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2023

  1. Configuration menu
    Copy the full SHA
    d2a1cf1 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    36c2af4 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2023

  1. Configuration menu
    Copy the full SHA
    caeea3b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d54baae View commit details
    Browse the repository at this point in the history
  3. remove .copy() from resample function

    Probably not necessary since the original series remains untouched?!
    martinvonk committed Mar 27, 2023
    Configuration menu
    Copy the full SHA
    d3dfca6 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    45909de View commit details
    Browse the repository at this point in the history
  5. fix reading/writing for datetime objects

    - convert to pastas equivalents if need be prior to writing
    dbrakenhoff committed Mar 27, 2023
    Configuration menu
    Copy the full SHA
    4ad5053 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    7a9e44c View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2023

  1. update type hint of add_stressmodel

    also accepts a list of StressModel
    martinvonk committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    179f95f View commit details
    Browse the repository at this point in the history
  2. move pytest fixture to conftest.py

    fixtures are now autodetected by pytest according to:
    https://docs.pytest.org/en/6.2.x/fixture.html
    martinvonk committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    0f56c8f View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    bc34829 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    ea3bfa5 View commit details
    Browse the repository at this point in the history
  5. change .yml workflow name:

    martinvonk committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    de33c79 View commit details
    Browse the repository at this point in the history
  6. fix step response in wrong plot

    axes should be -2 instead of -1
    martinvonk committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    5c74d9c View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2023

  1. Configuration menu
    Copy the full SHA
    330a808 View commit details
    Browse the repository at this point in the history

Commits on May 3, 2023

  1. Configuration menu
    Copy the full SHA
    9261a90 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    285a58f View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    1ac2182 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    fa77a86 View commit details
    Browse the repository at this point in the history

Commits on May 4, 2023

  1. improve WellModel (#570)

    dbrakenhoff committed May 4, 2023
    Configuration menu
    Copy the full SHA
    b1cfc4c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    aac3f9d View commit details
    Browse the repository at this point in the history
  3. add fix to wellmodel

    - for metadata passed as dict
    - for stresses passed as single column dataframes
    dbrakenhoff committed May 4, 2023
    Configuration menu
    Copy the full SHA
    0408850 View commit details
    Browse the repository at this point in the history
  4. black

    dbrakenhoff committed May 4, 2023
    Configuration menu
    Copy the full SHA
    bfab4c5 View commit details
    Browse the repository at this point in the history

Commits on May 5, 2023

  1. Configuration menu
    Copy the full SHA
    1938128 View commit details
    Browse the repository at this point in the history

Commits on May 11, 2023

  1. fix #577 improve validate_series (#578)

    Co-authored-by: Martin Vonk <vonk.mart@gmail.com>
    Co-authored-by: Martin Vonk <66305055+martinvonk@users.noreply.github.com>
    3 people committed May 11, 2023
    Configuration menu
    Copy the full SHA
    b5ccbd5 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c4f4c2d View commit details
    Browse the repository at this point in the history

Commits on May 12, 2023

  1. Configuration menu
    Copy the full SHA
    a7b11cc View commit details
    Browse the repository at this point in the history