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

Release 3.5.0 #2016

Merged
merged 103 commits into from
Nov 25, 2023
Merged

Release 3.5.0 #2016

merged 103 commits into from
Nov 25, 2023

Conversation

github-actions[bot]
Copy link
Contributor

FloPy 3.5.0

The release can be approved by merging this pull request into master. This will trigger a final job to publish the release to PyPI.

wpbonelli and others added 30 commits June 29, 2023 11:01
…ns from simulation namefile dfn (#1842)

* feat(simulation+model options):

Simulation and model file initialization parameters and attributes are now dynamically generated to include the namefile options found in the dfn file.

* lint + imports

---------

Co-authored-by: scottrp <45947939+scottrp@users.noreply.github.com>
* fix(exchange and gnc package cellids): #1866

* merge

---------

Co-authored-by: scottrp <45947939+scottrp@users.noreply.github.com>
* use ndarray.item() to retrieve single elements
* update gridutil get_disu_kwargs() docstrings
* modify pip upgrade in rtd workflow

Replaces PR #1848 (Close #1848)
)

* Adjust deprecation docs and messages, suggest to remove for FloPy 3.6
…kage (#1867) (#1873)

Co-authored-by: scottrp <45947939+scottrp@users.noreply.github.com>
…#1882)

* fix(check): check now works properly with confined conditions (#1880)

* github workflows undo

---------

Co-authored-by: scottrp <45947939+scottrp@users.noreply.github.com>
* describe deprecation policy loosely following NEP 23
* fix some autotest names per pending deprecations
* layer kwarg in get_data() in mfdataarray.py, 3.3.5 (June 2022)
* get_mvr_file, get_mvt_file, get_gnc_file in mfsimbase.py, overdue since 3.3.6
* get_ims_package in mfsimbase.py (and update usage in mfmodel.py), overdue since 3.4
- centered_specific_discharge, 3.3.1 (June 2020)
- cvfd_to_patch_collection, 3.3.4 (August 2021)
- plot_cvfd, 3.3.4 (August 2021)
wpbonelli and others added 16 commits November 13, 2023 17:24
* use µmamba in CI tests to avoid pyzmq issue
* remove pytest-virtualenv as test dependency
* rewrite generate_classes tests with virtualenv
* minor simplifications to autotest/conftest.py
* add python 3.12 classifier to pyproject.toml
* add code generation test marker to pytest.ini
* add IPRN value where missing in some example input files
* add pip and replace bmipy with xmipy in etc/environment.yml
* deduplicate in CI workflows (consolidate windows/non-windows)
* fix: add missing seek to get_runtime method
* too early for that assert
* fix(get_disu_kwargs): incorrect indexing of delr and delc

* add vertices to the return of get_disu_kwargs

* ensure nvert has proper value

* handle delr/delc and ensure size is correct

* isort

* Modify to allow mf6 autotest to pass
* support pandas dataframe for node_data, stress_period_data etc for flopy.modflow.* pkgs
* just convert to recarray, don't reimplement data storage with pandas like for mf6
* add tests with mnw and wel
* add function to return memory summary information as a dictionary
* add function to return full memory table information as a dictionary
* clarify that get_kstpkper() is 0-based, kstpkper is 1-based
* fix get_data() usage examples to use 0-based indices
* clarify warnings and error messages
* make ipakcb docstrings consistent for all modflow (non-mf6) packages
* make default ipakcb consistent (None for ipakcb=0 and no output file)
* add default_cbc_unit method to Package, support ipakcb=default for 53
@wpbonelli wpbonelli force-pushed the v3.5.0 branch 2 times, most recently from 1fd3c21 to 425c981 Compare November 25, 2023 15:37
Copy link

codecov bot commented Nov 25, 2023

Codecov Report

Merging #2016 (e906f1b) into master (45cb0fa) will increase coverage by 3.1%.
The diff coverage is 64.7%.

Additional details and impacted files
@@           Coverage Diff            @@
##           master   #2016     +/-   ##
========================================
+ Coverage    69.6%   72.8%   +3.1%     
========================================
  Files         256     259      +3     
  Lines       56269   59040   +2771     
========================================
+ Hits        39190   43004   +3814     
+ Misses      17079   16036   -1043     
Files Coverage Δ
flopy/discretization/unstructuredgrid.py 85.4% <ø> (+0.7%) ⬆️
flopy/export/metadata.py 23.3% <100.0%> (+0.8%) ⬆️
flopy/export/vtk.py 79.8% <ø> (+9.5%) ⬆️
flopy/mf6/data/mfdata.py 75.8% <100.0%> (+2.4%) ⬆️
flopy/mf6/data/mfdataarray.py 60.9% <ø> (+1.4%) ⬆️
flopy/mf6/data/mfdataplist.py 76.2% <ø> (ø)
flopy/mf6/data/mfdatascalar.py 60.5% <ø> (+0.4%) ⬆️
flopy/mf6/data/mfdatastorage.py 69.8% <ø> (+1.7%) ⬆️
flopy/mf6/data/mfdatautil.py 57.7% <ø> (+5.1%) ⬆️
flopy/mf6/data/mffileaccess.py 71.3% <ø> (-0.3%) ⬇️
... and 98 more

... and 59 files with indirect coverage changes

@wpbonelli wpbonelli marked this pull request as ready for review November 25, 2023 16:47
@wpbonelli
Copy link
Member

wpbonelli commented Nov 25, 2023

There were some conflicts here, fixed manually. Also trimmed some duplicates from the changelog. This was a result of not merging master back into develop after 3.4.2 and 3.4.3.

In the future merging master into develop after all releases (whether hotfix or planned) should avoid repeating this and is the typical approach with the git flow AFAIK

There are some extra things to mention w.r.t. deprecations and python3.12 compatibility, will add to the release notes

Copy link
Contributor

@langevin-usgs langevin-usgs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I looked through this PR, @wpbonelli. Looks good to me. I noticed only small version number issue, which may not be an issue at all.

@@ -5,7 +5,7 @@

.. image:: _images/flopylogo.png

**Documentation for version 3.3.7 --- release candidate**
**Documentation for version 3.5.0.dev0**
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this have a .dev0? This is the only place I noticed it. Everything else is just 3.5.0.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This gets updated when docs are built

# -- update version number in main.rst

however maybe in future it would be cleaner to sub it in with everything else via scripts/update_version.py

@wpbonelli wpbonelli merged commit 879c153 into master Nov 25, 2023
49 of 51 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.