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

Document use of new_axis to control merge #6180

Merged
merged 6 commits into from
Oct 23, 2024

Conversation

stephenworsley
Copy link
Contributor

🚀 Pull Request

Description

Closes #6162.
Requires SciTools/iris-sample-data#33.
May need to be adapted to account for #6168.

@stephenworsley stephenworsley marked this pull request as draft October 17, 2024 14:47
Copy link

codecov bot commented Oct 17, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 89.82%. Comparing base (3114912) to head (ff88cbc).
Report is 1 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #6180   +/-   ##
=======================================
  Coverage   89.82%   89.82%           
=======================================
  Files          88       88           
  Lines       23185    23185           
  Branches     4314     4314           
=======================================
  Hits        20825    20825           
  Misses       1628     1628           
  Partials      732      732           

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

Copy link
Member

@pp-mo pp-mo left a comment

Choose a reason for hiding this comment

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

The process seems very solid, but I have suggested a few possible improvements for clarity.

Obviously we aren't quite ready to merge this anyway, owing to the link with #6168 as you already noted.

docs/src/further_topics/controlling_merge.rst Show resolved Hide resolved
docs/src/further_topics/controlling_merge.rst Outdated Show resolved Hide resolved
docs/src/further_topics/controlling_merge.rst Outdated Show resolved Hide resolved
docs/src/further_topics/controlling_merge.rst Outdated Show resolved Hide resolved
docs/src/further_topics/controlling_merge.rst Outdated Show resolved Hide resolved
docs/src/further_topics/controlling_merge.rst Outdated Show resolved Hide resolved
docs/src/further_topics/controlling_merge.rst Outdated Show resolved Hide resolved
docs/src/further_topics/controlling_merge.rst Outdated Show resolved Hide resolved
Copy link
Member

@pp-mo pp-mo left a comment

Choose a reason for hiding this comment

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

Sorry, nearly there but there are a few problems remaining.

  • a couple of further suggestions on the diff
  • you need to include the new page in the 'further topics' TOC, since that doesn't happen automatically, and I couldn't view the built page in the docs even by substituting the page name
    I think you just need to add it here
  • the docs build is now working, but the doctests are still failing. I think it's a cartopy compatibility problem, which I hope may be fixed by just updating the branch, but I'll leave you to do that in case something goes wrong

docs/src/further_topics/controlling_merge.rst Outdated Show resolved Hide resolved
docs/src/further_topics/controlling_merge.rst Outdated Show resolved Hide resolved
stephenworsley and others added 4 commits October 22, 2024 11:55
* main:
  [pre-commit.ci] pre-commit autoupdate (SciTools#6175)
  Updated environment lockfiles (SciTools#6183)
  Update to `cell_method` parsing (SciTools#6083)
  Bump scitools/workflows from 2024.10.0 to 2024.10.1 (SciTools#6179)
  `colorbar` keyword for iris.quickplot routines (SciTools#6169)
  Make Iris backwards compatible with Cartopy (SciTools#6172)
  Updated environment lockfiles (SciTools#6173)
  Bump scitools/workflows from 2024.09.9 to 2024.10.0 (SciTools#6170)
  Update lock files, pin Cartopy!=0.23 (SciTools#6171)
* main:
  Updated environment lockfiles (SciTools#6184)
@stephenworsley stephenworsley marked this pull request as ready for review October 23, 2024 09:42
Copy link
Member

@pp-mo pp-mo left a comment

Choose a reason for hiding this comment

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

All good now, I think !

@pp-mo pp-mo merged commit e892fd1 into SciTools:main Oct 23, 2024
21 checks passed
ukmo-ccbunney added a commit to ukmo-ccbunney/iris that referenced this pull request Oct 23, 2024
…mpare

* upstream/main:
  Document use of new_axis to control merge (SciTools#6180)
  Updated environment lockfiles (SciTools#6184)
  [pre-commit.ci] pre-commit autoupdate (SciTools#6175)
  Updated environment lockfiles (SciTools#6183)
HGWright added a commit to HGWright/iris that referenced this pull request Oct 31, 2024
* upstream/main: (194 commits)
  Restore latest Whats New files.
  [pre-commit.ci] pre-commit autoupdate (SciTools#6205)
  correct major minor in whatsnew (SciTools#6202)
  What's new updates for v3.11.0rc0 . (SciTools#6201)
  Update CF standard names table. (SciTools#6200)
  Specify meta in dask.array.map_blocks (SciTools#5989)
  added in a vertical rule for surface fields (SciTools#5734)
  Updated environment lockfiles (SciTools#6197)
  Reduce duplication in cf.py spanning checks. (SciTools#6196)
  Fix attribute array comparison (SciTools#6181)
  Enable factory references to create new dimensions on load. (SciTools#6168) (SciTools#6194)
  Improve handling of masks in concatenate (SciTools#6187)
  Demo Numpy v2 (SciTools#6035)
  Bump scitools/workflows from 2024.10.1 to 2024.10.2 (SciTools#6186)
  Document use of new_axis to control merge (SciTools#6180)
  Updated environment lockfiles (SciTools#6184)
  [pre-commit.ci] pre-commit autoupdate (SciTools#6175)
  Updated environment lockfiles (SciTools#6183)
  Update to `cell_method` parsing (SciTools#6083)
  Bump scitools/workflows from 2024.10.0 to 2024.10.1 (SciTools#6179)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

Document new_axis utility
2 participants