Skip to content

Set the version number on the development branches to one minor version more than the last release #2964

Merged
valeriupredoi merged 2 commits intomainfrom
use-release-branch-semver
Jan 5, 2023
Merged

Set the version number on the development branches to one minor version more than the last release #2964
valeriupredoi merged 2 commits intomainfrom
use-release-branch-semver

Conversation

@bouweandela
Copy link
Member

@bouweandela bouweandela commented Dec 13, 2022

Description

This uses the next minor release as the development version. E.g. because we are currently developing v2.8, this sets the version number of development branches so it starts with v2.8.0-dev. See setuptool-scm for more detailed information.

Related to ESMValGroup/ESMValCore#1854.


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
Copy link
Member Author

bouweandela commented Dec 13, 2022

Tests are failing due to #2965

@valeriupredoi
Copy link
Contributor

@bouweandela would you mind turning the GA Test (just the test flow should do) on pls? And don't merge main just yet, I'd be curious to see the behaviour with shapely=2.0 and changing the version setter like in here. That is 100% our issue in Tool since esmvalcore on its own is very happy with shapely=2.0

@bouweandela
Copy link
Member Author

Maybe it's easiest of you run the tests yourself because you know what you want from this. Would that be OK with you? You could just create a new branch off this branch if you would like to use the changes in this one.

@valeriupredoi
Copy link
Contributor

aye, will do, man. Got some ideas before that anyway, steady as she goes for now

@valeriupredoi
Copy link
Contributor

@bouweandela now that I figured out the shapely issue, and it's got nothing to do with scm or versioning, I think we can release this into the wild; if you make it RFR then I can review it and get it out. One thing though - can we maybe change the pin of esmvalcore from 2.7* to >=2.7, so there are no issues with the dev branch of it?

@bouweandela
Copy link
Member Author

One thing though - can we maybe change the pin of esmvalcore from 2.7* to >=2.7, so there are no issues with the dev branch of it?

Would it make sense to create a separate issue to explain what the issue is? It seems unrelated to this pull request.

@bouweandela bouweandela marked this pull request as ready for review December 16, 2022 13:21
@valeriupredoi
Copy link
Contributor

yeah I opened #2971 - but am rather dubious about it since I noticed it only on my laptop (yeh, running an OK Ubuntu not 19th century 😆 )

Copy link
Contributor

@valeriupredoi valeriupredoi left a comment

Choose a reason for hiding this comment

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

easiest PR I've reviewed in months 😆

@bouweandela
Copy link
Member Author

@ESMValGroup/technical-lead-development-team Could someone please do a final check and merge?

@bouweandela bouweandela added this to the v2.8.0 milestone Jan 5, 2023
@valeriupredoi
Copy link
Contributor

I am a changed person in 2023 so I qualify to do the last checks and merge 🤣 (seriously now, I'm grabbing this in so we don't have to wait any more, if there are any issues, better find them earlier)

@valeriupredoi valeriupredoi merged commit 38abab8 into main Jan 5, 2023
@valeriupredoi valeriupredoi deleted the use-release-branch-semver branch January 5, 2023 13:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants