Update master to Pastas 1.1.0 #595

raoulcollenteur · 2023-05-11T11:33:14Z

Short Description

Add a short description describing the pull request (PR) here.

remove whitespace

- temporary(?) fix for tmin/tmax - ax.set_xlim("2010", "2015") not working with matplotlib 3.6.1 and pandas 1.5.3

revert nb change

make table optional

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

…tion-for-not-showing-statistics-table-in-pastasplotsseries

fix if statement

fix overwrite import

…into martinvonk-patch-1

automatically assign author of pull request https://github.com/marketplace/actions/auto-author-assign

Co-authored-by: Martin Vonk <vonk.mart@gmail.com>

black allows these errors

Probably not necessary since the original series remains untouched?!

- convert to pastas equivalents if need be prior to writing

also accepts a list of StressModel

fixtures are now autodetected by pytest according to: https://docs.pytest.org/en/6.2.x/fixture.html

axes should be -2 instead of -1

- for metadata passed as dict - for stresses passed as single column dataframes

codacy-production · 2023-05-11T11:35:24Z

Coverage summary from Codacy

Merging #595 (a7b11cc) into master (7302511) - See PR on Codacy

Coverage variation	Diff coverage
✅ +0.30% (target: +0.00%)	60.00%

Coverage variation details

	Coverable lines	Covered lines	Coverage
Common ancestor commit (`7302511`)	4970	3595	72.33%
Head commit (`a7b11cc`)	4955 (-15)	3599 (+4)	72.63% (+0.30%)

Coverage variation is the difference between the coverage for the head and common ancestor commits of the pull request branch: <coverage of head commit> - <coverage of common ancestor commit>

Diff coverage details

	Coverable lines	Covered lines	Diff coverage
Pull request (#595)	235	141	60.00%

Diff coverage is the percentage of lines that are covered by tests out of the coverable lines that the pull request added or modified: <covered lines added or modified>/<coverable lines added or modified> * 100%

See your quality gate settings Change summary preferences

martinvonk · 2023-05-11T12:26:01Z

I fixed the CI NB fail on #578. So if we merge that, this PR should be fine as well.

Co-authored-by: Martin Vonk <vonk.mart@gmail.com> Co-authored-by: Martin Vonk <66305055+martinvonk@users.noreply.github.com>

pastas/modelcompare.py

dbrakenhoff

Made some minor changes in a dbrakenhoff-patch-1.

After merging those, good to go as far as I'm concerned.

martinvonk and others added 30 commits February 15, 2023 11:20

Update types.py

19d2fd1

Update example_uncertainty.py

311def6

remove whitespace

fix tests

3eac98a

- temporary(?) fix for tmin/tmax - ax.set_xlim("2010", "2015") not working with matplotlib 3.6.1 and pandas 1.5.3

support linear trends in modelcompare

205faa9

codacy fixes for timer.py

25eeb8b

isort

4cc49df

fix notebooks pd Timestamp errors

51f8282

add tmin/tmax fix to ps.plots.series()

10522d3

revert nb change

Update plots.py

b109880

make table optional

Fix datetime axes with pandas.Timestamp and some other improvements (#…

a37e95c

…557)

Merge remote-tracking branch 'origin/dev' into 541-enhancement-add-op…

231bb1b

…tion-for-not-showing-statistics-table-in-pastasplotsseries

Merge remote-tracking branch 'origin/dev' into martinvonk-patch-1

307da88

make sure option is tested in a notebook

d1ad118

Update plots.py

219cad0

fix if statement

fix old types while we're at it

4c76d63

fix old types while we're at it

8240ef4

Update metrics.py

0222fa3

fix overwrite import

Merge branch 'martinvonk-patch-1' of https://github.com/pastas/pastas …

c803c73

…into martinvonk-patch-1

add stats summary check

96de513

Make table in pastas.plots.series() optional (#561)

ef8f88a

Update types.py to support Matplotlib <v3.4 (#553)

29ef2f9

Improve documentation (#560)

cf48f09

Fix issue #564

ea6797e

create and upload codacy coverage report from notebooks toxenv

15228e0

Create auto-author-assign.yml

7e97c3f

automatically assign author of pull request https://github.com/marketplace/actions/auto-author-assign

Improve modeling with non-daily timesteps (#556)

47870d3

Co-authored-by: Martin Vonk <vonk.mart@gmail.com>

ignore some flake8 errors

665f1d1

black allows these errors

fix ref

a01df01

Codacy coverage upload, auto-assign pr and flake8 update (#566)

072b6f0

martinvonk and others added 21 commits March 27, 2023 13:51

update docstring of pandas_equidistant_nearest

d54baae

remove .copy() from resample function

d3dfca6

Probably not necessary since the original series remains untouched?!

Add (Pandas) resample wrapper function to timeseries_utils (#581)

45909de

fix reading/writing for datetime objects

4ad5053

- convert to pastas equivalents if need be prior to writing

Pas datetime fixes for pastastore (#582)

7a9e44c

update type hint of add_stressmodel

179f95f

also accepts a list of StressModel

move pytest fixture to conftest.py

0f56c8f

fixtures are now autodetected by pytest according to: https://docs.pytest.org/en/6.2.x/fixture.html

rename notebooks toxenv to all

bc34829

test benchmark notebooks during pull requests to master

ea3bfa5

change .yml workflow name:

de33c79

fix step response in wrong plot

5c74d9c

axes should be -2 instead of -1

Update testing routine with fixtures and benchmark notebooks test (#583)

330a808

fix #571 warnings tracksolve (#579)

9261a90

Support Python 3.11 (#588)

285a58f

fix #549 stderr formatting (#580)

1ac2182

fix #575 duplicate columns in plots.compare() (#576)

fa77a86

improve WellModel (#570)

b1cfc4c

fix #551: up and gain_scale_factor are set by StressModel (#573)

aac3f9d

add fix to wellmodel

0408850

- for metadata passed as dict - for stresses passed as single column dataframes

black

bfab4c5

add fix to wellmodel (#589)

1938128

raoulcollenteur added this to the 1.1 milestone May 11, 2023

dbrakenhoff and others added 2 commits May 11, 2023 14:46

fix #577 improve validate_series (#578)

b5ccbd5

Co-authored-by: Martin Vonk <vonk.mart@gmail.com> Co-authored-by: Martin Vonk <66305055+martinvonk@users.noreply.github.com>

Merge main into dev (#596)

c4f4c2d

dbrakenhoff reviewed May 12, 2023

View reviewed changes

pastas/modelcompare.py Outdated Show resolved Hide resolved

dbrakenhoff approved these changes May 12, 2023

View reviewed changes

review release changes (#597)

a7b11cc

raoulcollenteur merged commit 5424a28 into master May 12, 2023
18 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update master to Pastas 1.1.0 #595

Update master to Pastas 1.1.0 #595

raoulcollenteur commented May 11, 2023 •

edited

codacy-production bot commented May 11, 2023 •

edited

martinvonk commented May 11, 2023

dbrakenhoff left a comment

Update master to Pastas 1.1.0 #595

Update master to Pastas 1.1.0 #595

Conversation

raoulcollenteur commented May 11, 2023 • edited

Short Description

codacy-production bot commented May 11, 2023 • edited

Coverage summary from Codacy

See your quality gate settings Change summary preferences

martinvonk commented May 11, 2023

dbrakenhoff left a comment

Choose a reason for hiding this comment

raoulcollenteur commented May 11, 2023 •

edited

codacy-production bot commented May 11, 2023 •

edited