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

fix(shapely): handle deprecation warnings from shapely 1.8 #1069

Merged
merged 1 commit into from Mar 19, 2021

Conversation

mwtoews
Copy link
Contributor

@mwtoews mwtoews commented Mar 4, 2021

Shapely 1.8 is in the pre-release stage, and has several deprecation warning messages. Some of these are in preparation for shapely 2.0, which has some breaking changes.

This PR aims to fix the ones that are revealed from the autotest suite. The context manager ignore_shapely_warnings_for_object_array is used to silence false-positive warnings when assigning shapely geometries to object arrays. It shouldn't be used for other legitimate deprecation warnings.

@codecov
Copy link

codecov bot commented Mar 4, 2021

Codecov Report

Merging #1069 (8a93dbb) into develop (3ccdd57) will increase coverage by 54.990%.
The diff coverage is 70.000%.

@@              Coverage Diff               @@
##           develop     #1069        +/-   ##
==============================================
+ Coverage   16.390%   71.381%   +54.990%     
==============================================
  Files          225       225                
  Lines        50699     51911      +1212     
==============================================
+ Hits          8310     37055     +28745     
+ Misses       42389     14856     -27533     
Impacted Files Coverage Δ
flopy/discretization/grid.py 76.420% <ø> (+29.545%) ⬆️
flopy/mf6/coordinates/simulationtime.py 52.777% <ø> (+13.888%) ⬆️
flopy/mf6/data/mffileaccess.py 67.417% <0.000%> (+61.374%) ⬆️
flopy/mf6/data/mfstructure.py 64.210% <0.000%> (+50.566%) ⬆️
flopy/mf6/modflow/mfgnc.py 32.142% <ø> (-20.799%) ⬇️
flopy/mf6/modflow/mfgwf.py 55.555% <ø> (+8.888%) ⬆️
flopy/mf6/modflow/mfgwfbuy.py 58.064% <ø> (+2.508%) ⬆️
flopy/mf6/modflow/mfgwfchd.py 56.521% <ø> (+10.367%) ⬆️
flopy/mf6/modflow/mfgwfcsub.py 53.781% <ø> (+14.719%) ⬆️
flopy/mf6/modflow/mfgwfdis.py 62.222% <ø> (+15.793%) ⬆️
... and 306 more

@jdhughes-usgs
Copy link
Contributor

@jlarsen-usgs or @dbrakenhoff let me know if you see any issues with the PR. I will merge the PR unless I hear otherwise from you by Monday.

@jdhughes-usgs jdhughes-usgs merged commit ff7b822 into modflowpy:develop Mar 19, 2021
@jdhughes-usgs
Copy link
Contributor

I just reran the autotests. @jlarsen-usgs and @dbrakenhoff every thing seems fine but let me know if you see anything that concerns you guys and we need to revert the changes. @mwtoews thanks for the PR.

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.

None yet

2 participants