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

Add support for prefixed version tags in scc #144

Merged
merged 4 commits into from
Feb 27, 2014
Merged

Conversation

sbesson
Copy link
Member

@sbesson sbesson commented Feb 10, 2014

With this commit, we sould now be able to tag the repository using
semver's recommended vX.Y.Z-METADATA. get_git_version has been updated to
recognize this new format so that both scc version and python setup.py sdist should work fine.

To test this PR:

  • check the unit tests pass
  • create a local annotated tag e.g. v0.5.0-rc1 and check python scc/main.py version and python setup.py sdist use the correct version

/cc @rleigh

With this commit, we sould now be able to tag the repository using
semver's recommended vX.Y.Z-METADATA. `get_git_version` has been updated to
recognize this new format so that both `scc version` and `python setup.py sdist` should work fine.
@joshmoore
Copy link
Member

👍 Looks good from my side. @rleigh-dundee?

@ghost
Copy link

ghost commented Feb 11, 2014

Why not call git describe with --match 'v.*' so that it can only ever match valid tags? Then you don't need any additional checking or mangling of the version?

@sbesson
Copy link
Member Author

sbesson commented Feb 11, 2014

@rleigh: the idea was to follow semver.org as much as possible and to valid the entire tag version like we do for our other repos at the moment.

@ghost
Copy link

ghost commented Feb 11, 2014

@sbesson what I mean is, git describe will find the first tag, and this might be anything, not necessarily a version tag, and this will break things. So adding --match will make it search the history until it finds a real release version tag. The validation you're doing on top of this is fine, but there's little point in picking up non-version tags by accident. This just adds robustness to avoid future problems.

@sbesson
Copy link
Member Author

sbesson commented Feb 11, 2014

Gotcha. Yes will push another commit. Thanks.

@sbesson
Copy link
Member Author

sbesson commented Feb 11, 2014

Note that this would imply redoing the tags and creating vVERSION tags on this repo first. Any veto?

@ghost
Copy link

ghost commented Feb 11, 2014

You only need one tag creating, just the latest one so that stuff will work until we tag the next release. Unless it's safe to do it for the whole history; but that doesn't need doing right now I think.

@bpindelski
Copy link

All looks good here. Unit tests pass and annotated tags get picket up as expected. Looks good to merge.

@joshmoore
Copy link
Member

🚢 ?

@sbesson
Copy link
Member Author

sbesson commented Feb 27, 2014

Merging for 0.5.0.

sbesson added a commit that referenced this pull request Feb 27, 2014
Add support for prefixed version tags in scc
@sbesson sbesson merged commit bf6338a into ome:master Feb 27, 2014
@sbesson sbesson deleted the version branch February 27, 2014 11:35
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.

3 participants