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

Update master-branch to Pastas 1.0: Arrabiata #529

Merged
merged 100 commits into from Feb 6, 2023
Merged

Update master-branch to Pastas 1.0: Arrabiata #529

merged 100 commits into from Feb 6, 2023

Conversation

raoulcollenteur
Copy link
Member

@raoulcollenteur raoulcollenteur commented Feb 3, 2023 •
edited

Short Description

Preparing to update the master-branch to Pastas 1.0.

Checklist before PR can be merged:

raoulcollenteur and others added 30 commits January 9, 2023 16:40
@raoulcollenteur
update dev-branch to v0.23.0b
b56f3b6 
- drop official python 3.7 support
- add python 3.11 support
@raoulcollenteur
wait with Python 3.11 support
7acc504 
As noted by @martinvonk , Numba is not ready yet, let's try again before the next release.
@raoulcollenteur
bump minimum scipy to 1.8 to fix #177
4e2b8b0 
Bumped minimum Scipy function to 1.8 to fix issue #177. Closes #177
@martinvonk @raoulcollenteur
Implement Type Hints (#441)
900a182 
Co-authored-by: Raoul Collenteur <raoulcollenteur@gmail.com>
@dbrakenhoff
448 black formatting (#457)
f1b5e8f
@dbrakenhoff
update contributing.rst
08fe3d7 
- reference black
- travis -> GitHub Actions
- remove release notes step (this is automated now)
@martinvonk
454 Add .gitattribute file for linguist settings (#456)
a366d4b 
- ignore .pas files since they are recognized as Pascal language
- count Jupyter Notebooks as Python language
@raoulcollenteur
remove ReservoirModel and StressModel2
9c67ffd 
- Move ReservoirModel to separate branch for future development
- Remove StressModel2, will throw Error with instructions when used (#421).
@raoulcollenteur
remove import of Reservoir model
32df37c
@dbrakenhoff
update ci with black formatting check
881a2b1
@dbrakenhoff
black and isort formatting part2
9f58ed5
@dbrakenhoff
update git ignore blame refs
6d6c6e3
@raoulcollenteur
introduce new validate_timeseries method
81550df 
This method can be used by users and stress models to thoroughly check the user-provided time series that are stresses (not oseries).
@raoulcollenteur
Merge branch 'dev' of https://github.com/pastas/pastas into dev
7b866e3
@raoulcollenteur
Revert "introduce new validate_timeseries method"
fc2ff9f 
This reverts commit 81550df.
@martinvonk @dbrakenhoff
Transition to pyproject.toml (#443)
00054dc 
Co-authored-by: dbrakenhoff <d.brakenhoff@artesia-water.nl>
@raoulcollenteur
change iteritems to items
b8a8312
@raoulcollenteur
Delete 19_reservoir.ipynb
59e85ab
@dbrakenhoff
update ci
5b2ed08 
only print files failing black formatting check.
@raoulcollenteur
Delete reservoir.py
fa3cb5a
@martinvonk @dbrakenhoff
442 fix python-publish.yml and improve version.py (#461)
0f37d1e 
Co-authored-by: dbrakenhoff <d.brakenhoff@artesia-water.nl>
@raoulcollenteur
Update pull_request_template.md
8039221 
Add black formatting (#448) and removing NB output to PR list.
@raoulcollenteur
Fix runtime error in ChangeModel (#464)
afcfd36
@raoulcollenteur
Have acf return conf instead of stderr (#465)
db33a67
@raoulcollenteur @dbrakenhoff
455 only allow pandas series as user input (#459)
0521b51 
Co-authored-by: dbrakenhoff <d.brakenhoff@artesia-water.nl>
@raoulcollenteur
Require user-provided response function to be instances (#466)
264b584
@raoulcollenteur
Update (docstring) formatting on model.py
30bf8c7
@raoulcollenteur
Update docstrings from recharge.py
860b2fe
@raoulcollenteur
Format docstrings in plots.py
b99e933
@raoulcollenteur
Format docstring for rfunc, solver, and decorators
dceeaa2 
Update after black
@raoulcollenteur raoulcollenteur added this to the 1.0: Arrabiata milestone Feb 3, 2023
@raoulcollenteur raoulcollenteur self-assigned this Feb 3, 2023
@codacy-production
Copy link

codacy-production bot commented Feb 3, 2023 •
edited

Coverage summary from Codacy

Merging #529 (9a4c525) into master (2bbc91e) - See PR on Codacy

Coverage variation Diff coverage
❌ -4.10% (target: +0.00%) 58.72%
Coverage variation details
Coverable lines Covered lines Coverage
Common ancestor commit (2bbc91e) 5312 3788 71.31%
Head commit (9a4c525) 5178 (-134) 3480 (-308) 67.21% (-4.10%)

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 (#529) 109 64 58.72%

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

@raoulcollenteur
Copy link
Member Author

Will check on the conflicting files after merging #502 into dev.

@raoulcollenteur @martinvonk
@mbakker7 @dbrakenhoff
Pastas docs 1.0 (#502)
1fb9fc0 
Co-authored-by: Martin Vonk <vonk.mart@gmail.com>
Co-authored-by: Mark Bakker <markbak@gmail.com>
Co-authored-by: dbrakenhoff <d.brakenhoff@artesia-water.nl>
@raoulcollenteur
Copy link
Member Author

This PR is ready (for review). I had to deal with the merge conflicts, so I chose the file from the dev-branch for all files, and then added the one line from 0.23.1 in again in the last commit. @dbrakenhoff perhaps check this?

@raoulcollenteur
Copy link
Member Author

Thanks for the Reviews, I just updated the version and changed the status to stable. I will merge as soon as the check are completed.

@dbrakenhoff
Copy link
Member

I fixed a few things codacy mentioned.

@raoulcollenteur raoulcollenteur merged commit 05fc109 into master Feb 6, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dbrakenhoff dbrakenhoff dbrakenhoff approved these changes

@martinvonk martinvonk martinvonk approved these changes

Assignees

@raoulcollenteur raoulcollenteur

Labels
None yet
Projects
None yet
Milestone
1.0: Arrabiata
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@raoulcollenteur @dbrakenhoff @martinvonk @mbakker7 @rubencalje