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

Cf cell method #5224

Merged
merged 9 commits into from Apr 4, 2023
Merged

Cf cell method #5224

merged 9 commits into from Apr 4, 2023

Conversation

HGWright
Copy link
Contributor

🚀 Pull Request

Description

This is a draft while making sure doctests pass, Also missing a whatsnew entry that will be added when moving out of draft

Finishes #4279.

The cell methods section of the cube printout was not printing in a CF-compliant manner and so this PR goes towards changing that.


Consult Iris pull request check list

* 'main' of github.com:SciTools/iris:
  Benchmark runner script (SciTools#5215)
  add locks readme (SciTools#5222)
  use explicit version for ci refresh-lockfiles gha (SciTools#5221)
  SciTools#5180 do not run publish-to-test-pypi on forks (SciTools#5220)
  Fix Makefile for consequences of SciTools#5204. (SciTools#5217)
@codecov
Copy link

codecov bot commented Mar 31, 2023

Codecov Report

Patch coverage: 100.00% and project coverage change: -0.01 ⚠️

Comparison is base (6b25c3a) 89.28% compared to head (577787d) 89.28%.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #5224      +/-   ##
==========================================
- Coverage   89.28%   89.28%   -0.01%     
==========================================
  Files          88       88              
  Lines       22269    22268       -1     
  Branches     4870     4874       +4     
==========================================
- Hits        19882    19881       -1     
  Misses       1641     1641              
  Partials      746      746              
Impacted Files Coverage Δ
lib/iris/common/resolve.py 92.88% <ø> (ø)
lib/iris/cube.py 90.56% <ø> (ø)
lib/iris/_representation/cube_summary.py 100.00% <100.00%> (ø)
lib/iris/coords.py 93.20% <100.00%> (ø)

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

Copy link
Contributor

@trexfeathers trexfeathers left a comment

Choose a reason for hiding this comment

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

Thanks @HGWright, awesome work. Some comments for you...

lib/iris/coords.py Outdated Show resolved Hide resolved
lib/iris/coords.py Outdated Show resolved Hide resolved
lib/iris/coords.py Outdated Show resolved Hide resolved
lib/iris/_representation/cube_summary.py Outdated Show resolved Hide resolved
lib/iris/coords.py Show resolved Hide resolved
@trexfeathers
Copy link
Contributor

Also this pre-commit failure is an easy fix - just remove the import.

image

@pp-mo
Copy link
Member

pp-mo commented Mar 31, 2023

Also this pre-commit failure is an easy fix - just remove the import.

image

P.S. you should have been warned of this when you commited, so I guess you are have not installed the pre-commit tool.
There is advice here : https://scitools-iris.readthedocs.io/en/stable/developers_guide/contributing_code_formatting.html?highlight=pre-commit#code-formatting
For extra points, it would be great to know, if that does not work!

lib/iris/common/resolve.py Outdated Show resolved Hide resolved
HGWright and others added 4 commits April 3, 2023 10:31
* 'main' of github.com:SciTools/iris:
  Bump scitools/workflows from 2023.03.2 to 2023.03.3 (SciTools#5227)
  raise dask min pin (SciTools#5225)
  Enable lazy computation of wind vector rotation (SciTools#4972)
…l_method

* 'cf_cell_method' of github.com:HGWright/iris:
  [pre-commit.ci] auto fixes from pre-commit.com hooks
@trexfeathers
Copy link
Contributor

Great! I'll merge once this is out of draft

@HGWright HGWright marked this pull request as ready for review April 3, 2023 13:23
@trexfeathers trexfeathers merged commit 1a92b5c into SciTools:main Apr 4, 2023
17 checks passed
@trexfeathers trexfeathers linked an issue Apr 4, 2023 that may be closed by this pull request
tkknight added a commit to tkknight/iris that referenced this pull request Apr 4, 2023
* upstream/main: (274 commits)
  Cf cell method (SciTools#5224)
  Bump scitools/workflows from 2023.03.3 to 2023.04.1 (SciTools#5231)
  [pre-commit.ci] pre-commit autoupdate (SciTools#5230)
  Bump scitools/workflows from 2023.03.2 to 2023.03.3 (SciTools#5227)
  raise dask min pin (SciTools#5225)
  Enable lazy computation of wind vector rotation (SciTools#4972)
  Benchmark runner script (SciTools#5215)
  add locks readme (SciTools#5222)
  use explicit version for ci refresh-lockfiles gha (SciTools#5221)
  SciTools#5180 do not run publish-to-test-pypi on forks (SciTools#5220)
  Fix Makefile for consequences of SciTools#5204. (SciTools#5217)
  Bump actions/stale from 7 to 8 (SciTools#5208)
  Remove Iris' TestRunner (SciTools#5205)
  standardize requirements structure (SciTools#5204)
  Updated environment lockfiles (SciTools#5199)
  Add histogram convenience for passing Iris objects to plt.hist (SciTools#5189)
  Updated environment lockfiles (SciTools#5192)
  announce new contributor in whatsnew (SciTools#5198)
  iris.util.new_axis anonymous new dimension fix (SciTools#5194)
  Lockfiles and pydata-sphinx-theme fix (SciTools#5188)
  ...
tkknight added a commit to tkknight/iris that referenced this pull request Apr 13, 2023
* upstream/main: (59 commits)
  Updated environment lockfiles (SciTools#5211)
  update ci locks location (SciTools#5228)
  Fixes to _discontiguity_in_bounds (attempt 2) (SciTools#4975)
  Finalises Lazy Data documentation (SciTools#5137)
  Modernize and simplify iris.analysis._Groupby (SciTools#5015)
  clarity on whatsnew entry contributors (SciTools#5240)
  Handle derived coordinates correctly in `concatenate` (SciTools#5096)
  Use real array for data of of small netCDF variables. (SciTools#5229)
  Bump scitools/workflows from 2023.04.1 to 2023.04.2 (SciTools#5236)
  fixing whatsnew entry
  remove results creation commit from blame
  configure codecov
  adding a whatsnew entry
  Replacing numpy legacy printing with array2string and remaking results for dependent tests
  Adding a whatsnew entry for 5224 (SciTools#5234)
  Cf cell method (SciTools#5224)
  Bump scitools/workflows from 2023.03.3 to 2023.04.1 (SciTools#5231)
  [pre-commit.ci] pre-commit autoupdate (SciTools#5230)
  Bump scitools/workflows from 2023.03.2 to 2023.03.3 (SciTools#5227)
  raise dask min pin (SciTools#5225)
  ...
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.

Correct CellMethod.__str__ method to be CF-compliant
3 participants