Skip to content

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

Merged
jdhughes-dev merged 1 commit into
modflowpy:developfrom
mwtoews:shapely-deprecations
Mar 19, 2021
Merged

fix(shapely): handle deprecation warnings from shapely 1.8#1069
jdhughes-dev merged 1 commit into
modflowpy:developfrom
mwtoews:shapely-deprecations

Conversation

@mwtoews
Copy link
Copy Markdown
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.

@mwtoews mwtoews force-pushed the shapely-deprecations branch from 1b08ee8 to f9287cd Compare March 4, 2021 02:28
@codecov
Copy link
Copy Markdown

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-dev
Copy link
Copy Markdown
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-dev jdhughes-dev merged commit ff7b822 into modflowpy:develop Mar 19, 2021
@jdhughes-dev
Copy link
Copy Markdown
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.

@mwtoews mwtoews deleted the shapely-deprecations branch March 21, 2021 20:48
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.

2 participants