ESMValGroup / ESMValTool

ESMValTool: A community diagnostic and performance metrics tool for routine evaluation of Earth system models in CMIP
https://www.esmvaltool.org
Apache License 2.0
210 stars 121 forks source link

Pin importlib_metadata <8 #3700

Closed ehogan closed 1 day ago

ehogan commented 1 day ago

Description

Before you get started

Checklist

It is the responsibility of the author to make sure the pull request is ready to review. The icons indicate whether the item will be subject to the ๐Ÿ›  Technical or ๐Ÿงช Scientific review.


To help with the number of pull requests:

bouweandela commented 1 day ago

Is this needed for the main branch? I understood that importlib_metadata version 8 is incompatible with esmpy < 8.6, but in the main branch esmpy is pinned to >= 8.6 since #3643.

ehogan commented 1 day ago

Is this needed for the main branch? I understood that importlib_metadata version 8 is incompatible with esmpy < 8.6, but in the main branch esmpy is pinned to >= 8.6 since #3643.

Ah, yes, since importlib_metadata will be removed from ESMValCore after this release (see my comment on #3699), it makes sense to add this change to the release branch. I have updated the PR to target the release branch ๐Ÿ‘

ehogan commented 1 day ago

Is this needed for the main branch? I understood that importlib_metadata version 8 is incompatible with esmpy < 8.6, but in the main branch esmpy is pinned to >= 8.6 since #3643.

Ah, yes, since importlib_metadata will be removed from ESMValCore after this release (see my comment on #3699), it makes sense to add this change to the release branch. I have updated the PR to target the release branch ๐Ÿ‘

Although, I just realised that we'll need to merge the ESMValTool release branch back into main, so this change will end up on main anyway, unless I revert the change on the release branch after it is tagged but before the merge to main? ๐Ÿค”

bouweandela commented 21 hours ago

Did you not tag a release candidate before creating the release branch?

ehogan commented 20 hours ago

Did you not tag a release candidate before creating the release branch?

Not for ESMValTool, because I thought a release candidate wasn't created for ESMValTool? (There aren't any release candidates listed at https://github.com/ESMValGroup/ESMValTool/releases.)

bouweandela commented 20 hours ago

Not previously, but it would be nice to start doing that to avoid the merge the release branch back into the main branch issue. Let's do it next release then and merge back for now.

ehogan commented 20 hours ago

It is possible to do it for this release; I would tag main before the esmpy PR I reverted, recreate the release branch from that tag, then cherry-pick everything after the esmpy PR (14 PRs) onto the release branch. Happy to do that if you'd prefer? ๐Ÿ˜Š

bouweandela commented 19 hours ago

Yes, that would be great, if it's not too much work, you seem busy enough as it is.

bouweandela commented 19 hours ago

I think you could also tag the current main branch, create the release branch, and cherry pick c7abf572721e1e73abf6aa6c5b45f8f92d92fbe3 and c0ab625aadac8a4330efa6b0158a6aa2e61bc052 into it.

ehogan commented 17 hours ago

I think you could also tag the current main branch, create the release branch, and cherry pick c7abf57 and c0ab625 into it.

Ok, that sounds good, I'll try that ๐Ÿ‘