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

Removed use of catch_warnings #5685

Merged
merged 10 commits into from
Jan 11, 2024
Merged

Conversation

ESadek-MO
Copy link
Contributor

Closes #5536.

Removed catch_warnings, by moving the functionality to parse_cell_methods()

Copy link

codecov bot commented Jan 9, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (2bfaebd) 89.69% compared to head (b63e91c) 89.69%.
Report is 3 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #5685   +/-   ##
=======================================
  Coverage   89.69%   89.69%           
=======================================
  Files          90       90           
  Lines       22809    22809           
  Branches     5441     5440    -1     
=======================================
  Hits        20458    20458           
  Misses       1618     1618           
  Partials      733      733           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@stephenworsley
Copy link
Contributor

Before:

image

After:

image

Compare with #5506 (comment)

Copy link
Contributor

@stephenworsley stephenworsley left a comment

Choose a reason for hiding this comment

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

Looks good, I think this could do with a test to explicitly check that this avoids warning repeats similar to this one (feel free to copy this test) https://github.com/SciTools/iris/pull/5506/files#diff-517f51f31e7b2402608486de8f2f1a79f004d9591eb17869451b9f27a61518b3R495

Copy link
Contributor

@stephenworsley stephenworsley left a comment

Choose a reason for hiding this comment

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

Looking good, just a couple thoughts about how the tests might be made more robust to future changes to warning behaviour.

lib/iris/tests/integration/netcdf/test_general.py Outdated Show resolved Hide resolved
lib/iris/tests/integration/netcdf/test_general.py Outdated Show resolved Hide resolved
lib/iris/tests/integration/netcdf/test_general.py Outdated Show resolved Hide resolved
lib/iris/tests/integration/netcdf/test_general.py Outdated Show resolved Hide resolved
Copy link
Contributor

@stephenworsley stephenworsley left a comment

Choose a reason for hiding this comment

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

Just a couple tweaks to the comments here

lib/iris/tests/integration/netcdf/test_general.py Outdated Show resolved Hide resolved
lib/iris/tests/integration/netcdf/test_general.py Outdated Show resolved Hide resolved
lib/iris/tests/integration/netcdf/test_general.py Outdated Show resolved Hide resolved
Copy link
Contributor

@stephenworsley stephenworsley left a comment

Choose a reason for hiding this comment

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

Looks good!

@stephenworsley stephenworsley merged commit 1d71bd4 into SciTools:main Jan 11, 2024
17 checks passed
tkknight added a commit to tkknight/iris that referenced this pull request Jan 12, 2024
* upstream/main:
  Removed use of catch_warnings (SciTools#5685)
@trexfeathers
Copy link
Contributor

Should there have been a What's New entry here?

@ESadek-MO ESadek-MO deleted the warnings branch January 12, 2024 15:29
tkknight added a commit to tkknight/iris that referenced this pull request Jan 15, 2024
* upstream/main:
  ruff compliance for D205. (SciTools#5681)
  Added whatsnew to warnings PR (SciTools#5696)
  Removed use of catch_warnings (SciTools#5685)
  Better documentation for Cube names in curl (SciTools#5680)
  fix typo (SciTools#5689)
  Make further topics obviously different (SciTools#5684)
  [pre-commit.ci] pre-commit autoupdate (SciTools#5682)
tkknight added a commit to tkknight/iris that referenced this pull request Jan 15, 2024
* upstream/main:
  ruff compliance for D205. (SciTools#5681)
  Added whatsnew to warnings PR (SciTools#5696)
  Removed use of catch_warnings (SciTools#5685)
  Better documentation for Cube names in curl (SciTools#5680)
  fix typo (SciTools#5689)
tkknight added a commit to tkknight/iris that referenced this pull request Jan 15, 2024
* upstream/main:
  ruff compliance for D205. (SciTools#5681)
  Added whatsnew to warnings PR (SciTools#5696)
  Removed use of catch_warnings (SciTools#5685)
  Better documentation for Cube names in curl (SciTools#5680)
tkknight added a commit to tkknight/iris that referenced this pull request Jan 24, 2024
* upstream/main: (26 commits)
  Bump scitools/workflows from 2023.12.1 to 2024.01.0 (SciTools#5710)
  Faster trivial equality checks for coordinates and arrays (SciTools#5691)
  Make the Coord.cell method lazy (SciTools#5693)
  Re-write `pearsonr` to use `Resolve` (SciTools#5638)
  ruff compliance for D401. (SciTools#5687)
  Bump actions/cache from 3 to 4 (SciTools#5703)
  update rtd ubuntu and mambaforge (SciTools#5702)
  [pre-commit.ci] pre-commit autoupdate (SciTools#5699)
  ruff compliance for D205. (SciTools#5681)
  Added whatsnew to warnings PR (SciTools#5696)
  Removed use of catch_warnings (SciTools#5685)
  Better documentation for Cube names in curl (SciTools#5680)
  fix typo (SciTools#5689)
  Make further topics obviously different (SciTools#5684)
  [pre-commit.ci] pre-commit autoupdate (SciTools#5682)
  ruff complliance for D100. (SciTools#5678)
  move tests.pp to tests.__init__ (SciTools#5679)
  ruff compliance for D417, D106 (SciTools#5677)
  ruff compliance for D200. (SciTools#5675)
  ruff compliance for D106. (SciTools#5676)
  ...
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.

Remove problematic use of catch_warnings
3 participants