Skip to content

Merge tags from v2.15.x to main after 2.15.0 release#3171

Closed
flicj191 wants to merge 24 commits into
mainfrom
v2.15.x
Closed

Merge tags from v2.15.x to main after 2.15.0 release#3171
flicj191 wants to merge 24 commits into
mainfrom
v2.15.x

Conversation

@flicj191

@flicj191 flicj191 commented Jul 16, 2026

Copy link
Copy Markdown
Contributor

Merge tags from v2.15.x to main after 2.15.0 release

  • Don't have permissions to push for step in docs
  • commits should already be in main

jmalles and others added 24 commits June 30, 2026 14:04
Co-authored-by: Katja Weigel <weigel@iup.physik.uni-bremen.de>
Co-authored-by: Felicity Chun <32269066+flicj191@users.noreply.github.com>
Co-authored-by: Romain Beucher <romain.beucher@anu.edu.au>
…a facets from ``~/.esmvaltool/extra_facets/`` (#3137)
Co-authored-by: Manuel Schlund <32543114+schlunma@users.noreply.github.com>
Co-authored-by: Supriyo Ghosh <supriyo.ghosh@bsc.es>
Co-authored-by: Bouwe Andela <b.andela@esciencecenter.nl>
Co-authored-by: Romain Beucher <romain.beucher@anu.edu.au>
@flicj191
flicj191 requested review from bouweandela and schlunma July 16, 2026 02:12
@codecov

codecov Bot commented Jul 16, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 96.25%. Comparing base (8b248f5) to head (3e9a372).
⚠️ Report is 19 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #3171      +/-   ##
==========================================
+ Coverage   96.22%   96.25%   +0.02%     
==========================================
  Files         273      274       +1     
  Lines       16150    16189      +39     
==========================================
+ Hits        15541    15582      +41     
+ Misses        609      607       -2     

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

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@bouweandela

Copy link
Copy Markdown
Member

What is the purpose of this pull request?

Don't have permissions to push for step in docs

That was already done in #3120. There is no need to do it again.

@flicj191

Copy link
Copy Markdown
Contributor Author

Ok, the way the docs sounds is that we want the all the tags in main as well so I thought the final one v2.15.0 should be in there even if we said we didn't need the other release candidate tags. That in #3120 just has the first release candidate tag and not the others. But happy to close this as not needed.

@flicj191 flicj191 closed this Jul 16, 2026
@bouweandela

Copy link
Copy Markdown
Member

Thank you for explaining. The only reason we want a tag v2.15.something tag that points to a commit in main is to get the automatic versioning with setuptools-scm right. The first release candidate is enough for that. I will update the docs on making a release sometime soon. The Met Office said they would do that after I spent a lot of time explaining the release process to them back when they did the v2.11 release in 2024, but sadly it never happened.

@schlunma

Copy link
Copy Markdown
Contributor

I personally think it wouldn't be the worst idea to ensure that all tags are in the main branch. For example, this would ensure that tools like git describe actually work. But that's probably just a matter of taste.

@flicj191

Copy link
Copy Markdown
Contributor Author

Thanks! I'll try to update the docs and send through a PR

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.

6 participants