Skip to content

Conversation

@bouweandela
Copy link
Member

@bouweandela bouweandela commented Dec 8, 2022

Description

This sets the version number on the main and feature branches so it starts with v2.8.0.dev (considering that the current release is v2.7.0). To make a release branch for a previous release, call it v2.7.x and the version number will be automatically correct (e.g. something starting with v2.7.1-dev if branched of the v2.7.0 tag). This approach avoids the need to merge micro releases back into the main branch just to get the version number right.

@ESMValGroup/technical-lead-development-team

See https://pypi.org/project/setuptools-scm/ for the details.


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 pull requests:

@bouweandela bouweandela added the installation Installation problem label Dec 8, 2022
@bouweandela bouweandela changed the title Set the version number on the main branch to one minor version more than the previous release Set the version number on the development branches to one minor version more than the previous release Dec 8, 2022
@codecov
Copy link

codecov bot commented Dec 8, 2022

Codecov Report

Merging #1854 (eb1ddd2) into main (a9d39e1) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             main    #1854   +/-   ##
=======================================
  Coverage   91.59%   91.59%           
=======================================
  Files         203      203           
  Lines       10989    10989           
=======================================
  Hits        10065    10065           
  Misses        924      924           

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

Copy link

@zklaus zklaus left a comment

Choose a reason for hiding this comment

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

LGTM. Should also be cherry-picked into the release branch, right?

@valeriupredoi
Copy link
Contributor

cheers @bouweandela - do we have to pin setuptools_scm be with toml like here maybe?

@valeriupredoi
Copy link
Contributor

also, if you turn on GA you can directly see the version after the test runs pip install ...

@valeriupredoi
Copy link
Contributor

this looks noice 😁

Successfully built ESMValCore
Installing collected packages: ESMValCore
  Attempting uninstall: ESMValCore
    Found existing installation: ESMValCore 2.7.1.dev32+g54385ac.d20221128
    Uninstalling ESMValCore-2.7.1.dev32+g54385ac.d20221128:
      Successfully uninstalled ESMValCore-2.7.1.dev32+g54385ac.d20221128
Successfully installed ESMValCore-2.8.0.dev44+geb1ddd2

@valeriupredoi valeriupredoi mentioned this pull request Dec 8, 2022
8 tasks
@bouweandela bouweandela marked this pull request as ready for review December 8, 2022 13:26
@bouweandela
Copy link
Member Author

bouweandela commented Dec 8, 2022

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

installation Installation problem release

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants