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

update(intersect): update to raise error only when interface is called improperly #1489

Merged
merged 4 commits into from
Aug 11, 2022
Merged

Conversation

jlarsen-usgs
Copy link
Contributor

Closes #1481

@codecov
Copy link

codecov bot commented Aug 9, 2022

Codecov Report

Merging #1489 (a45dd78) into develop (9c42c37) will decrease coverage by 40.886%.
The diff coverage is 0.000%.

@@              Coverage Diff               @@
##           develop     #1489        +/-   ##
==============================================
- Coverage   70.827%   29.940%   -40.887%     
==============================================
  Files          250       250                
  Lines        54002     52535      -1467     
==============================================
- Hits         38248     15729     -22519     
- Misses       15754     36806     +21052     
Impacted Files Coverage Δ
flopy/discretization/grid.py 49.889% <0.000%> (-25.499%) ⬇️
flopy/discretization/structuredgrid.py 22.686% <0.000%> (-24.335%) ⬇️
flopy/discretization/unstructuredgrid.py 27.707% <0.000%> (-40.222%) ⬇️
flopy/discretization/vertexgrid.py 24.363% <0.000%> (-58.484%) ⬇️
flopy/mfusg/mfusgsms.py 6.190% <0.000%> (-91.941%) ⬇️
flopy/mf6/utils/postprocessing.py 9.259% <0.000%> (-88.889%) ⬇️
flopy/seawat/swtvdf.py 8.092% <0.000%> (-88.460%) ⬇️
flopy/modflow/mfevt.py 7.537% <0.000%> (-87.463%) ⬇️
flopy/utils/mtlistfile.py 4.620% <0.000%> (-85.348%) ⬇️
flopy/mf6/utils/lakpak_utils.py 2.097% <0.000%> (-85.315%) ⬇️
... and 209 more

@wpbonelli
Copy link
Member

The Windows/Python3.10 CI failure looks like something I introduced in a recent PR. The cache miniconda step is trying to hash the entire flopy module to check for changes, rather than just etc/environment.yml. I think I did that while debugging and forgot to remove it. Sorry about that.

I can fix in a PR later today, unless you want to here @jlarsen-usgs

@jlarsen-usgs
Copy link
Contributor Author

Updated the CI. Thanks for the help @w-bonelli

@wpbonelli
Copy link
Member

I reran CI jobs due to more flakiness in the tests for get-modflow. This time it looks like a different internal GitHub issue. Discussions:

I removed the @flaky marker last week after @mwtoews added internal retries, but I guess it might be worth re-marking semi-permanently in case this resurfaces. Can do so in a new PR if this goes in.

@mwtoews
Copy link
Contributor

mwtoews commented Aug 9, 2022

Thanks for the info @w-bonelli, it seems to be a similar transient network issue. I'll apply some more internal retry logic for this HTTP error. Not sure when I'll get this done, could be a couple of days, so feel free to re-add @flaky for now.

wpbonelli added a commit to wpbonelli/flopy that referenced this pull request Aug 10, 2022
* use pytest-benchmark's builtin profiling capability instead of manual implementation
* remove requires_exe(mf6) from test_mf6.py tests that don't run models/simulations
* add @requires_spatial_reference marker to conftest.py (for tests depending on spatialreference.org)
* try both importlib.import_module and pkg_resources.get_distribution in @requires_pkg marker
* mark test_lgr.py::test_simple_lgr_model_from_scratch as flaky (occasional forrtl error (65): floating invalid)
* split test_export.py::test_polygon_from_ij into network-bound and non-network-bound cases
* add comments to flaky tests with links to potentially similar issues
* add timeouts to CI jobs (10min for build, lint, & smoke, 45min for test, 90min for daily jobs)
* remove unneeded markers from pytest.ini
* match profiling/benchmarking test files in pytest.ini
* mark get-modflow tests as flaky (modflowpy#1489 (comment))
* various tidying/cleanup
wpbonelli added a commit to wpbonelli/flopy that referenced this pull request Aug 10, 2022
* use pytest-benchmark's builtin profiling capability instead of manual implementation
* remove requires_exe(mf6) from test_mf6.py tests that don't run models/simulations
* add @requires_spatial_reference marker to conftest.py (for tests depending on spatialreference.org)
* try both importlib.import_module and pkg_resources.get_distribution in @requires_pkg marker
* mark test_lgr.py::test_simple_lgr_model_from_scratch as flaky (occasional forrtl error (65): floating invalid)
* split test_export.py::test_polygon_from_ij into network-bound and non-network-bound cases
* add comments to flaky tests with links to potentially similar issues
* add timeouts to CI jobs (10min for build, lint, & smoke, 45min for test, 90min for daily jobs)
* remove unneeded markers from pytest.ini
* match profiling/benchmarking test files in pytest.ini
* mark get-modflow tests as flaky (modflowpy#1489 (comment))
* cache benchmark results in daily CI and compare with prior runs
* various tidying/cleanup
wpbonelli added a commit that referenced this pull request Aug 10, 2022
test: update pytest framework

* use pytest-benchmark's builtin profiling capability instead of manual implementation
* remove requires_exe("mf6") from test_mf6.py tests that don't run models/simulations
* add @requires_spatial_reference marker to conftest.py (for tests depending on spatialreference.org)
* split test_export.py::test_polygon_from_ij into network-bound and non-network-bound cases
* try both importlib.import_module and pkg_resources.get_distribution in @requires_pkg marker
* mark test_lgr.py::test_simple_lgr_model_from_scratch as flaky (occasional forrtl error (65): floating invalid)
* add comments to flaky tests with links to potentially similar issues
* remove unneeded markers from pytest.ini
* match profiling/benchmarking test files in pytest.ini
* mark get-modflow tests as flaky (#1489 (comment))
* add timeouts to CI jobs (10min for build, lint, & smoke, 45min for test, 90min for daily jobs)
* cache benchmark results in daily CI and compare with prior runs
* fix benchmark CI artifact names
* various tidying/cleanup
wpbonelli added a commit to wpbonelli/flopy that referenced this pull request Aug 10, 2022
* use pytest-benchmark's builtin profiling capability instead of manual implementation
* remove requires_exe(mf6) from test_mf6.py tests that don't run models/simulations
* add @requires_spatial_reference marker to conftest.py (for tests depending on spatialreference.org)
* try both importlib.import_module and pkg_resources.get_distribution in @requires_pkg marker
* mark test_lgr.py::test_simple_lgr_model_from_scratch as flaky (occasional forrtl error (65): floating invalid)
* split test_export.py::test_polygon_from_ij into network-bound and non-network-bound cases
* add comments to flaky tests with links to potentially similar issues
* add timeouts to CI jobs (10min for build, lint, & smoke, 45min for test, 90min for daily jobs)
* remove unneeded markers from pytest.ini
* match profiling/benchmarking test files in pytest.ini
* mark get-modflow tests as flaky (modflowpy#1489 (comment))
* cache benchmark results in daily CI and compare with prior runs
* various tidying/cleanup
@wpbonelli wpbonelli merged commit 7e690a2 into modflowpy:develop Aug 11, 2022
wpbonelli pushed a commit to wpbonelli/flopy that referenced this pull request Dec 14, 2022
…mproperly (modflowpy#1489)

* update intersect warning to raise error only when interface is called improperly
* update VertexGrid and UnstructuredGrid intersect routines
* remove "flopy" from hashFiles call in CI
wpbonelli pushed a commit to wpbonelli/flopy that referenced this pull request Dec 14, 2022
…mproperly (modflowpy#1489)

* update intersect warning to raise error only when interface is called improperly
* update VertexGrid and UnstructuredGrid intersect routines
* remove "flopy" from hashFiles call in CI
wpbonelli pushed a commit that referenced this pull request Dec 14, 2022
…mproperly (#1489)

* update intersect warning to raise error only when interface is called improperly
* update VertexGrid and UnstructuredGrid intersect routines
* remove "flopy" from hashFiles call in CI
wpbonelli pushed a commit to wpbonelli/flopy that referenced this pull request Dec 14, 2022
…mproperly (modflowpy#1489)

* update intersect warning to raise error only when interface is called improperly
* update VertexGrid and UnstructuredGrid intersect routines
* remove "flopy" from hashFiles call in CI
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.

warning generated despite correct syntax
4 participants